diff options
| author | HoraK-FDF <horak-fdf@web.de> | 2023-06-01 06:54:56 +0000 |
|---|---|---|
| committer | HoraK-FDF <horak-fdf@web.de> | 2023-06-01 06:54:56 +0000 |
| commit | 5ce318195ff0b976a78bc708c5910069d4fa4957 (patch) | |
| tree | 79d626fadbd402c0f43e5493358d3bee6339b8e8 | |
| parent | 92b95e0fa66720c9bf52b347830567355cf8630d (diff) | |
| parent | 4660621d40af1a1342fb3a2900ac96f21bb6b88f (diff) | |
| download | clientdata-5ce318195ff0b976a78bc708c5910069d4fa4957.tar.gz clientdata-5ce318195ff0b976a78bc708c5910069d4fa4957.tar.bz2 clientdata-5ce318195ff0b976a78bc708c5910069d4fa4957.tar.xz clientdata-5ce318195ff0b976a78bc708c5910069d4fa4957.zip | |
Merge branch 'master' into 'items_descriptions'
# Conflicts:
# items.xml
# items/equip-1hand/item571_Setzer.xml
# items/equip-1hand/item578_SandCutter.xml
# items/equip-head/item5130_Phylactery.xml
333 files changed, 7164 insertions, 7502 deletions
diff --git a/.gitmodules b/.gitmodules index 6da1e30c..0930241e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "music"] path = music url = https://git.themanaworld.org/legacy/music.git +[submodule "mods"] + path = mods + url = https://git.themanaworld.org/legacy/mods.git diff --git a/effects.xml b/effects.xml index 4a095a57..1510bdde 100644 --- a/effects.xml +++ b/effects.xml @@ -54,6 +54,7 @@ <!-- <effect id="20" particle="graphics/particles/magic.barrier.xml"/> --> <effect id="21" particle="graphics/particles/pentagram-buildup-short.xml"/> <effect id="22" particle="graphics/particles/pentagram-burst.xml"/> + <effect id="23" audio="env/zap.ogg" particle="graphics/particles/zap.xml"/> <effect id="24" audio="system/warp.ogg" particle="graphics/particles/magic.teleport.xml"/> <!-- #kaflosh (rain) hit --> <effect id="25" particle="graphics/particles/rain.xml" audio="magic/kaflosh.ogg"/> diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png Binary files differindex 882ab481..c2da82ad 100644 --- a/graphics/minimaps/002-1.png +++ b/graphics/minimaps/002-1.png diff --git a/graphics/minimaps/004-1.png b/graphics/minimaps/004-1.png Binary files differindex 70e5337a..f380134d 100644 --- a/graphics/minimaps/004-1.png +++ b/graphics/minimaps/004-1.png diff --git a/graphics/minimaps/008-1.png b/graphics/minimaps/008-1.png Binary files differindex 7bd3fe0a..05538347 100644 --- a/graphics/minimaps/008-1.png +++ b/graphics/minimaps/008-1.png diff --git a/graphics/minimaps/009-1.png b/graphics/minimaps/009-1.png Binary files differindex 2df74ddb..a9515387 100644 --- a/graphics/minimaps/009-1.png +++ b/graphics/minimaps/009-1.png diff --git a/graphics/minimaps/015-1.png b/graphics/minimaps/015-1.png Binary files differindex eeefbc93..2a45a009 100644 --- a/graphics/minimaps/015-1.png +++ b/graphics/minimaps/015-1.png diff --git a/graphics/minimaps/018-1.png b/graphics/minimaps/018-1.png Binary files differindex 9551395a..f5db0731 100644 --- a/graphics/minimaps/018-1.png +++ b/graphics/minimaps/018-1.png diff --git a/graphics/minimaps/030-4.png b/graphics/minimaps/030-4.png Binary files differindex 4adc15c7..5a907c8d 100644 --- a/graphics/minimaps/030-4.png +++ b/graphics/minimaps/030-4.png diff --git a/graphics/minimaps/041-1.png b/graphics/minimaps/041-1.png Binary files differindex 72f89efd..e718db72 100644 --- a/graphics/minimaps/041-1.png +++ b/graphics/minimaps/041-1.png diff --git a/graphics/minimaps/042-1.png b/graphics/minimaps/042-1.png Binary files differindex b96f7443..7063ef44 100644 --- a/graphics/minimaps/042-1.png +++ b/graphics/minimaps/042-1.png diff --git a/graphics/minimaps/047-1.png b/graphics/minimaps/047-1.png Binary files differindex 2e778ba5..c1a4015e 100644 --- a/graphics/minimaps/047-1.png +++ b/graphics/minimaps/047-1.png diff --git a/graphics/particles/zap.xml b/graphics/particles/zap.xml new file mode 100644 index 00000000..3fc60fd4 --- /dev/null +++ b/graphics/particles/zap.xml @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<!-- +Electricity flows downwards on target +--> +<effect> + <particle position-x="0" position-y="0" position-z="120" lifetime="1"> + <emitter> + <property name="lifetime" value="300"/> + <property name="output" min="5" max="30"/> + <property name="position-x" min="-32" max="32"/> + <property name="position-y" min="-16" max="-32"/> + <property name="position-z" value="-120"/> + <property name="gravity" value="1"/> + <property name="momentum" value="0.1"/> + <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15"> + <sequence start="0" end="7" delay="20"/> + </animation> + <property name="fade-out" value="0"/> + </emitter> + </particle> +</effect> diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.png b/graphics/sprites/icons/spell-cooldown-upmarmu.png Binary files differnew file mode 100644 index 00000000..231e9599 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-upmarmu.png diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.xml b/graphics/sprites/icons/spell-cooldown-upmarmu.xml new file mode 100644 index 00000000..a294ef98 --- /dev/null +++ b/graphics/sprites/icons/spell-cooldown-upmarmu.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/icons/spell-cooldown-upmarmu.png" width="13" height="21"/> + <action name="default" imageset="base"> + <animation direction="default"> + <frame index="0" offsetY="-8" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/monsters/floyd.png b/graphics/sprites/monsters/floyd.png Binary files differindex 9e8b787c..225b50e4 100644 --- a/graphics/sprites/monsters/floyd.png +++ b/graphics/sprites/monsters/floyd.png diff --git a/graphics/sprites/monsters/golem-blackcrystal.png b/graphics/sprites/monsters/golem-blackcrystal.png Binary files differindex be28544e..dd51c46e 100644 --- a/graphics/sprites/monsters/golem-blackcrystal.png +++ b/graphics/sprites/monsters/golem-blackcrystal.png diff --git a/graphics/sprites/monsters/golem-crystal.png b/graphics/sprites/monsters/golem-crystal.png Binary files differindex c564f850..c4aebd1e 100644 --- a/graphics/sprites/monsters/golem-crystal.png +++ b/graphics/sprites/monsters/golem-crystal.png diff --git a/graphics/sprites/monsters/montblanc.png b/graphics/sprites/monsters/montblanc.png Binary files differnew file mode 100644 index 00000000..7a2ba0bb --- /dev/null +++ b/graphics/sprites/monsters/montblanc.png diff --git a/graphics/sprites/monsters/montblanc.xml b/graphics/sprites/monsters/montblanc.xml new file mode 100644 index 00000000..bdcc615a --- /dev/null +++ b/graphics/sprites/monsters/montblanc.xml @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/monsters/montblanc.png" width="634" height="470"/> + <imageset name="dead" src="graphics/sprites/npcs/blanc.png" width="527" height="467"/> + <action name="stand" imageset="base"> + <animation> + <frame index="0"/> + </animation> + </action> + <action name="dead" imageset="dead"> + <animation> + <frame index="0"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/monsters/pet-cat.png b/graphics/sprites/monsters/pet-cat.png Binary files differnew file mode 100644 index 00000000..8c366c6e --- /dev/null +++ b/graphics/sprites/monsters/pet-cat.png diff --git a/graphics/sprites/npcs/blanc.png b/graphics/sprites/npcs/blanc.png Binary files differnew file mode 100644 index 00000000..1d294db4 --- /dev/null +++ b/graphics/sprites/npcs/blanc.png diff --git a/graphics/sprites/npcs/blanc.xml b/graphics/sprites/npcs/blanc.xml new file mode 100644 index 00000000..34080d47 --- /dev/null +++ b/graphics/sprites/npcs/blanc.xml @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<sprite variants="1" variant_offset="1"> + <imageset name="base" src="graphics/sprites/npcs/blanc.png" width="527" height="467"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <frame index="0"/> + </animation> + </action> +</sprite> diff --git a/graphics/tiles/blanc.png b/graphics/tiles/blanc.png Binary files differnew file mode 100644 index 00000000..1d294db4 --- /dev/null +++ b/graphics/tiles/blanc.png diff --git a/items/equip-head/item5128_DarkHelm.xml b/items/equip-head/item5128_DarkHelm.xml index c9526392..5d6f76c2 100644 --- a/items/equip-head/item5128_DarkHelm.xml +++ b/items/equip-head/item5128_DarkHelm.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <items> - <item id="5128" image="equipment/head/dark-helm.png" name="Dark Helm" description="The Energy pulses with the power of the void." effect="+10% HP / 0 Int" type="equip-head" defense="19" weight="800"> + <item id="5128" image="equipment/head/dark-helm.png" name="Dark Helm" description="The Energy pulses with the power of the void." effect="+10% HP Max / +10% HP recovery / 0 Int" type="equip-head" defense="19" weight="800"> <sprite gender="unisex">equipment/head/dark-helm.xml</sprite> <sprite gender="female">equipment/head/dark-helm-female.xml</sprite> <replace sprite="hair"> @@ -152,6 +152,7 @@ File | Artists | Licenses `graphics/items/equipment/charms/towel.png` | Bjorn | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/charms/manapearl.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 `graphics/items/equipment/charms/assassin-amulet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/items/equipment/charms/darktalisman.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 #### Chest File | Artists | Licenses @@ -619,7 +620,10 @@ File | Artists | Licenses `graphics/particles/star-small.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/waterfall-a.png` | Modanung | GPLv2, CC BY-SA 3.0 `graphics/particles/manapearl_4x4.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 - +`graphics/particles/snowflake-7x7.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/particles/snowflake-9x9.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/particles/hex-facet-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/particles/hex-facet-outline-50.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 ### Skills File | Artists | Licenses @@ -662,6 +666,21 @@ File | Artists | Licenses `graphics/sprites/icons/slow-poison.png` | Freeyorp101 | GPLv2, CC BY-SA 3.0 `graphics/sprites/icons/spell-haste.png` | Graingert | GPLv2 `graphics/sprites/icons/spell-protection-generic.png` | Freeyorp101 | GPLv2, CC BY-SA 3.0 +`graphics/sprites/icons/weight-big.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/weight-small.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-mg.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-mt.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-ench.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-koy.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-ar.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-ar-outline.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-r.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-r-outline.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-cooldown-upmarmu.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/spell-attack-generic-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/feather-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/hidden-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/icons/invisible-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 #### Actor Models File | Artists | Licenses @@ -689,6 +708,7 @@ File | Artists | Licenses `graphics/sprites/equipment/weapons/wand-deathshand.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/wand.png` | :grey_question:, Wushin | GPLv2 `graphics/sprites/equipment/weapons/beheader.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 +`graphics/sprites/equipment/weapons/sandcutter.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0 `graphics/sprites/equipment/weapons/gun.png` | Skipy, Jesusalva | GPLv2 #### Chest @@ -919,6 +939,9 @@ File | Artists | Licenses `graphics/sprites/monsters/goblin-fire.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/goblin-ice.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/golem.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/golem-red.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/golem-blackcrystal.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/golem-crystal.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/larvespa.png` | Arikel | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/lizard.png` | Len, Pateame | GPLv2 `graphics/sprites/monsters/logmonster.png` | FotherJ | GPLv2, CC BY-SA 3.0 @@ -928,6 +951,7 @@ File | Artists | Licenses `graphics/sprites/monsters/moggun.png` | Modanung, Pateame | GPLv2 `graphics/sprites/monsters/mouboo.png` | Yuuki | GPLv2 `graphics/sprites/monsters/mouboo-demonic.png` | Cassy, Yuuki | GPLv2 +`graphics/sprites/monsters/montblanc.png` | KokoroReflections | CC BY 4.0 `graphics/sprites/monsters/mushroom-red.png` | Yuuki | GPLv2 `graphics/sprites/monsters/mushroom-spiky.png` | Yuuki | GPLv2 `graphics/sprites/monsters/mushroom-void.png` | Cassy, Yuuki, Jesusalva | GPLv2 @@ -952,6 +976,7 @@ File | Artists | Licenses `graphics/sprites/monsters/snake.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/snowflower.png` | Salmondine | GPLv2 `graphics/sprites/monsters/spider.png` | FotherJ | GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/spider-crystal.png` | FotherJ, HoraK-FDF | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/spinning-scythe.png` | Nmaligec, Skipy | GPLv2 `graphics/sprites/monsters/spirit-demonic.png` | :grey_question:, Neoriceisgood, V0id | GPLv2 `graphics/sprites/monsters/squirrel.png` | FotherJ, Wombat | GPLv2, CC BY-SA 3.0 @@ -1106,6 +1131,7 @@ File | Artists | Licenses `graphics/tiles/inn2.png` | Alige, Irukard, Salmondine | GPLv2 `graphics/tiles/light-flickering-x1x4.png` | Micksha | GPLv2, CC BY-SA 3.0 `graphics/tiles/mushrooms.png` | Dave, Len | GPLv2 +`graphics/tiles/shipwreck_blanc.png` | KokoroReflections, Hocus | CC BY 4.0 `graphics/tiles/snow_docks.png` | Irukard, Arikel, Meway, Wombat | GPLv2 `graphics/tiles/snow_ground.png` | bagzie, gumi, :grey_question: | GPLv2 `graphics/tiles/snow_tree_x3.png` | :grey_question:, Alige, Hal9000 | GPLv2 diff --git a/maps/001-1.tmx b/maps/001-1.tmx index adceb3c0..1a150ac0 100644 --- a/maps/001-1.tmx +++ b/maps/001-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="103"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="103"> <properties> <property name="minimap" value="graphics/minimaps/001-1.png"/> <property name="music" value="faith.ogg"/> @@ -188,7 +188,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,1225,300,300,300,0,0,0,0,0,0,0,0,300,300,300,1227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1681,1676,1705,914,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,1257,0,0,0,0,0,0,1259,0,0,0,1259,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1695,1690,898,913,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1237,1238,1226,1239,1240,0,0,0,85,86,86,89,86,86,86,89,89,86,86,86,89,89,1241,1242,1242,1242,1257,1381,1382,0,0,1383,1384,1259,1242,1242,1242,1242,86,86,86,86,89,86,89,86,86,86,86,86,86,86,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1695,1690,914,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1285,1286,1306,1287,1288,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,0,1439,0,0,0,0,1439,0,0,0,0,1259,49,202,80,80,79,80,80,80,79,80,80,79,80,186,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1029,1051,1031,1051,1051,1031,1051,1051,1031,1051,1051,1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1695,1690,914,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1285,1286,1306,1287,1288,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,0,1439,0,0,0,0,1439,0,0,0,0,1259,49,202,80,80,79,80,80,80,79,80,80,79,80,186,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1029,1051,1031,1051,1051,1031,1051,1051,1031,1051,1051,1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1695,1690,914,0,0,0,0,0,0,0,11,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1301,1302,0,1303,1304,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,1454,1455,1456,0,0,1454,1455,1456,0,0,0,1259,0,107,0,0,0,0,0,0,0,0,0,0,0,107,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1004,1005,1006,1004,1005,1006,1004,1005,1006,1004,1005,1006,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1681,1676,1705,914,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,1305,1471,1472,0,0,1470,1471,1307,0,0,0,1259,0,107,0,0,0,0,0,0,0,0,0,0,0,107,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1020,1021,1022,1020,1021,1022,1020,1021,1022,1020,1021,1022,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1681,1676,1705,898,913,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1257,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1259,0,107,0,0,0,941,942,943,0,0,0,0,0,107,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1036,1037,1038,1036,1037,1038,1036,1037,1038,1036,1037,1038,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1681,1676,1705,898,913,0,0,0,0,0,0,0,0,0,0, @@ -332,7 +332,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,1259,0,0,0,0,40,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,994,0,0,0,0,0,0,0,0,0,0,996,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1470,1471,1472,0,0,1470,1471,1472,0,0,0,0,0,0,0,0,56,0,0,0,36,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,994,0,716,0,0,0,0,0,0,0,0,996,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,938,939,940,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1110,1013,713,716,0,0,0,0,0,1079,0,0,996,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1318,57 +1318,57 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup id="10" name="Objects"> + <objectgroup id="10" name="Objects" visible="0"> <object id="3" name="South Tulimshar" type="warp" x="1952" y="3808" width="160" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="63"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="63"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="4" name="South Tulimshar" type="warp" x="3232" y="3808" width="160" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="103"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="103"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="27" name="GreenSlime" type="spawn" x="864" y="1728" width="352" height="384"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="3"/> </properties> </object> <object id="29" name="GreenSlime" type="spawn" x="1280" y="3040" width="352" height="384"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="3"/> </properties> </object> <object id="34" name="SeaSlime" type="spawn" x="1056" y="1856" width="288" height="1120"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="31"/> </properties> </object> <object id="40" name="Maggot" type="spawn" x="1728" y="1824" width="2112" height="1792"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="0"/> </properties> </object> <object id="41" name="SeaSlime" type="spawn" x="1728" y="1824" width="2112" height="1792"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="31"/> </properties> @@ -1376,86 +1376,86 @@ <object id="51" name="To Government Building" type="warp" x="1760" y="2272" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="52" name="To Government Building" type="warp" x="1664" y="2272" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="53" name="To Government Building" type="warp" x="1568" y="2272" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="54" name="To Tulimshar Forge" type="warp" x="3648" y="3168" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="64"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="64"/> </properties> </object> <object id="58" name="To MIT" type="warp" x="864" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="60" name="graphics/particles/magic-building-aura.particle.xml" type="particle_effect" x="2208" y="768" width="32" height="32"/> <object id="95" name="To MIT" type="warp" x="1184" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="71"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="71"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="96" name="To Tulimshar Castle" type="warp" x="1728" y="1088" width="64" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="104"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="104"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="97" name="Council Chambers" type="warp" x="1664" y="704" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="95"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="95"/> + <property name="dest_y" value="52"/> </properties> </object> <object id="98" name="Council Chambers" type="warp" x="1824" y="704" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="52"/> </properties> </object> <object id="99" name="To MIT" type="warp" x="896" y="736" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="87"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="87"/> </properties> </object> <object id="101" name="Sewers" type="warp" x="896" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="021-3"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="102" name="To Bank" type="warp" x="1888" y="3136" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="65"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="65"/> + <property name="dest_y" value="25"/> </properties> </object> </objectgroup> diff --git a/maps/001-2.tmx b/maps/001-2.tmx index 75ced5b0..bc6b3d9d 100644 --- a/maps/001-2.tmx +++ b/maps/001-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="140" height="123" tilewidth="32" tileheight="32" nextobjectid="55"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="123" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="55"> <properties> <property name="music" value="faith.ogg"/> <property name="name" value="South Tulimshar Indoor"/> @@ -20,7 +20,7 @@ <tileset firstgid="1426" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="1474" source="../tilesets/desert_castle_interior_x2.tsx"/> <tileset firstgid="1490" source="../tilesets/cave2_sewer_mine.tsx"/> - <layer name="Ground1" width="140" height="123" opacity="0.99"> + <layer id="1" name="Ground1" width="140" height="123" opacity="0.99"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -147,7 +147,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="140" height="123"> + <layer id="2" name="Ground2" width="140" height="123"> <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, @@ -274,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 </data> </layer> - <layer name="Ground3" width="140" height="123"> + <layer id="3" name="Ground3" width="140" height="123"> <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, @@ -401,7 +401,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 </data> </layer> - <layer name="Fringe" width="140" height="123"> + <layer id="4" name="Fringe" width="140" height="123"> <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, @@ -528,7 +528,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 </data> </layer> - <layer name="Over1" width="140" height="123"> + <layer id="5" name="Over1" width="140" height="123"> <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, @@ -655,7 +655,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 </data> </layer> - <layer name="Over2" width="140" height="123"> + <layer id="6" name="Over2" width="140" height="123"> <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, @@ -782,7 +782,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 </data> </layer> - <layer name="Collision" width="140" height="123" visible="0"> + <layer id="7" name="Collision" width="140" height="123" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -909,63 +909,63 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="8" name="Objects"> <object id="11" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="768" y="1568" width="32" height="32"/> <object id="12" name="To Outside" type="warp" x="800" y="2080" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="100"/> </properties> </object> <object id="14" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="672" y="1568" width="32" height="32"/> <object id="23" name="To Outside" type="warp" x="896" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="27"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="27"/> + <property name="dest_y" value="33"/> </properties> </object> <object id="24" name="To Light" type="warp" x="896" y="2752" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="26" name="To Outside" type="warp" x="3328" y="3264" width="64" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="54"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="54"/> + <property name="dest_y" value="35"/> </properties> </object> <object id="27" name="To Outside" type="warp" x="800" y="896" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="72"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="72"/> </properties> </object> <object id="28" name="To Outside" type="warp" x="896" y="896" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="52"/> - <property name="dest_tile_y" value="72"/> + <property name="dest_x" value="52"/> + <property name="dest_y" value="72"/> </properties> </object> <object id="39" name="To Outside" type="warp" x="992" y="896" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="55"/> - <property name="dest_tile_y" value="72"/> + <property name="dest_x" value="55"/> + <property name="dest_y" value="72"/> </properties> </object> <object id="40" name="To Outside" type="warp" x="2272" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="37"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="37"/> + <property name="dest_y" value="33"/> </properties> </object> <object id="41" name="graphics/particles/forge.particle.xml" type="particle_effect" x="3584" y="2304" width="32" height="32"/> @@ -973,50 +973,50 @@ <object id="43" name="Council Chambers" type="warp" x="3296" y="2336" width="128" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="104"/> - <property name="dest_tile_y" value="42"/> + <property name="dest_x" value="104"/> + <property name="dest_y" value="42"/> </properties> </object> <object id="44" name="Main Floor" type="warp" x="3296" y="1376" width="128" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="104"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="104"/> + <property name="dest_y" value="74"/> </properties> </object> <object id="45" name="Parapet" type="warp" x="3648" y="1696" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="57"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="57"/> + <property name="dest_y" value="23"/> </properties> </object> <object id="46" name="Parapet" type="warp" x="3040" y="1696" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="52"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="52"/> + <property name="dest_y" value="23"/> </properties> </object> <object id="47" name="Lighthouse" type="warp" x="1824" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="94"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="94"/> </properties> </object> <object id="48" name="MainFloor" type="warp" x="1152" y="3008" width="32" height="64"> <properties> <property name="dest_map" value="001-2"/> - <property name="dest_tile_x" value="58"/> - <property name="dest_tile_y" value="90"/> + <property name="dest_x" value="58"/> + <property name="dest_y" value="90"/> </properties> </object> <object id="50" name="Outside" type="warp" x="2080" y="832" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="99"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="99"/> </properties> </object> <object id="51" name="Alchemy" type="node" x="3136" y="2848" width="32" height="32"/> diff --git a/maps/001-3.tmx b/maps/001-3.tmx index 8e87ccb9..4ba0dfd3 100644 --- a/maps/001-3.tmx +++ b/maps/001-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" nextobjectid="5"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="5"> <properties> <property name="minimap" value="graphics/minimaps/001-3.png"/> <property name="name" value="Tulimshar Arena"/> @@ -8,7 +8,7 @@ <tileset firstgid="3" source="../tilesets/cave.tsx"/> <tileset firstgid="131" source="../tilesets/arena.tsx"/> <tileset firstgid="387" source="../tilesets/cave_x2.tsx"/> - <layer name="Ground1" width="150" height="150"> + <layer id="1" name="Ground1" width="150" height="150"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -162,7 +162,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="150" height="150"> + <layer id="2" name="Fringe" width="150" height="150"> <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, @@ -316,7 +316,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 </data> </layer> - <layer name="Over1" width="150" height="150"> + <layer id="3" name="Over1" width="150" height="150"> <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, @@ -470,7 +470,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 </data> </layer> - <layer name="Collision" width="150" height="150"> + <layer id="4" name="Collision" width="150" height="150"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -624,12 +624,12 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="5" name="Objects"> <object id="1" name="To Tulimshar Indoor" type="warp" x="2336" y="896" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="74"/> - <property name="dest_tile_y" value="59"/> + <property name="dest_x" value="74"/> + <property name="dest_y" value="59"/> </properties> </object> <object id="2" name="Phaet the Royal Guard" type="npc" x="2480" y="1200"> @@ -646,8 +646,8 @@ </object> <object id="4" name="Maggot" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="10"/> <property name="monster_id" value="0"/> </properties> diff --git a/maps/002-1.tmx b/maps/002-1.tmx index db56eea3..493d22fb 100644 --- a/maps/002-1.tmx +++ b/maps/002-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="30"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="30"> <properties> <property name="minimap" value="graphics/minimaps/002-1.png"/> <property name="music" value="faith.ogg"/> @@ -28,6 +28,7 @@ <tileset firstgid="1518" name="npcs" tilewidth="50" tileheight="80" tilecount="42" columns="14"> <image source="../graphics/sprites/npcs/2006__npcs.png" width="700" height="240"/> </tileset> + <tileset firstgid="1560" source="../tilesets/shipwreck_blanc.tsx"/> <layer id="1" name="Ground1" width="140" height="140"> <data encoding="csv"> 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1412,1394,3,3,3,3,3,3,383,384,385,3,3,3,3,216,217,3,3,3,3,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,1449,1449,1449,1449,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,404,3,3,3,3,3,3,3,3,216,217,151,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, @@ -142,7 +143,7 @@ 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,120,136,137,424,425,153,154,442,442,442,442,442,442,442,442,442,442,442,442,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,3,3,3,3,3,428,428,428,428,428,428,414,3,3,3,3,490,491,492,3,3,474,475,475,475,475,476,3,3,3,3,3,3,3,3,3,3,3,166,151,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,120,136,152,153,440,441,169,500,435,436,436,436,436,436,437,442,442,442,442,442,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,3,3,442,3,3,3,3,3,3,3,412,428,428,428,428,428,430,3,3,3,3,3,442,442,3,3,3,3,475,475,476,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,136,152,168,169,442,485,500,442,451,452,452,452,452,452,453,442,442,442,442,442,3,3,3,3,3,3,3,3,395,395,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,352,353,354,3,412,412,428,445,428,444,446,3,3,137,9,3,3,442,442,501,3,3,3,474,475,476,3,3,442,442,442,442,3,3,3,442,442,442,442,149,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, -1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,152,168,6,7,442,485,442,3,451,452,452,452,452,452,453,442,442,442,442,442,3,3,3,3,3,3,3,3,3,396,397,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,368,369,427,412,412,428,428,444,446,151,3,120,121,3,459,459,3,442,484,3,3,3,342,343,343,344,3,3,442,442,64,63,3,3,3,442,442,442,63,165,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, +1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,152,168,6,7,442,485,442,3,451,452,452,452,452,452,453,442,442,442,442,442,3,3,3,3,3,3,3,3,3,396,397,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,3,3,368,369,427,412,412,428,428,444,446,151,3,120,121,3,459,459,3,442,484,3,3,3,342,343,343,344,3,3,3,442,64,63,3,3,3,442,442,442,63,165,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,168,3,3,66,442,485,500,3,451,452,452,452,452,452,453,3,3,3,352,353,354,3,3,3,3,411,395,395,395,428,428,414,137,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,383,384,385,442,427,444,412,442,442,3,3,120,136,409,3,475,475,476,442,484,442,3,3,358,359,359,360,3,3,64,62,442,442,3,3,3,61,442,61,442,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,442,442,442,442,442,442,451,452,452,452,452,452,453,3,3,3,368,369,3,3,3,3,3,446,411,395,428,428,430,3,3,396,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,399,400,401,3,3,427,412,3,3,3,3,136,152,425,154,475,475,475,459,459,442,3,3,358,359,390,376,3,3,64,442,442,442,3,3,3,442,442,442,442,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 1431,1431,1431,1431,1431,1431,1431,1431,1431,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,442,442,442,442,442,442,467,468,468,468,468,468,469,3,3,383,384,385,3,3,3,443,446,428,411,446,428,428,430,3,429,396,414,3,3,3,3,3,3,3,3,3,3,9,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,152,168,441,170,491,491,475,475,476,442,501,501,374,375,376,3,3,3,442,442,64,442,3,3,3,442,442,442,62,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, @@ -222,20 +223,20 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,898,899,913,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,916,0,914,0,841,843,916,0,914,843,843,843,916,0,914,843,845,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,749,0,15,916,0,914,0,0,0,916,0,914,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,107,916,0,914,0,0,0,916,0,914,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1377,1372,1401,914,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,80,80,80,80,79,80,80,80,80,130,916,0,914,0,0,0,916,0,914,0,0,0,916,0,914,0,0,0,0,0,0,0,564,565,0,0,0,523,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,930,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,932,0,930,931,931,931,932,0,930,931,931,931,932,0,914,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1377,1372,1401,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1377,1372,1401,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,898,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1377,1372,1401,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,48,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1377,1372,1401,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,356,0,916,0,914,0,362,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,914,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,0,0,0,0,0,0,0,372,0,916,0,914,0,378,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,931,932,0,930,931,897,0,0,0,0,0,0,0,0,0,0,0,0,0,202,80,80,79,80,80,80,80,79,80,80,79,80,80,80,79,80,79,80,80,79,80,79,80,79,80,91,80,79,80,79,80,79,80,79,80,79,80,80,186,0,0,0,0,0,0,564,565,0,0,524,0,564,565,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,914,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,463,0,0,464,0,0,0,107,0,0,32,30,33,30,0,31,0,24,0,31,0,32,30,0,0,33,0,33,24,24,33,0,0,34,0,0,24,32,32,31,32,0,0,33,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,930,897,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,941,942,942,943,0,0,0,0,0,0,0,0,0,34,0,0,31,0,31,30,33,33,0,0,30,0,31,32,0,0,33,56,33,33,30,31,0,0,0,107,0,0,24,33,33,33,30,33,31,33,0,0,107,0,0,0,0,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1560,1561,1562,1563,1564,1565,1566,1567,1568,1569,1570,1571,1572,1573,1574,1575,0,0,0,0,1377,1372,1401,914,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,80,80,80,80,79,80,80,80,80,130,916,0,914,0,0,0,916,0,914,0,0,0,916,0,914,0,0,0,0,0,0,0,564,565,0,0,0,523,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,0,0,0,0,1391,1386,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,930,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,932,0,930,931,931,931,932,0,930,931,931,931,932,0,914,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1592,1593,1594,1595,1596,1597,1598,1599,1600,1601,1602,1603,1604,1605,1606,1607,0,0,0,1377,1372,1401,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,0,0,1377,1372,1401,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,898,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,899,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1624,1625,1626,1627,1628,1629,1630,1631,1632,1633,1634,1635,1636,1637,1638,1639,0,0,1391,1386,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1640,1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,0,1377,1372,1401,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,48,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1377,1372,1401,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,1686,1687,1391,1386,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,356,0,916,0,914,0,362,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0, +0,0,0,0,0,0,0,0,0,0,0,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,1701,1702,1703,1391,1386,914,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,0,0,0,0,0,0,0,372,0,916,0,914,0,378,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,931,932,0,930,931,897,0,0,0,0,0,0,0,0,0,0,0,0,0,202,80,80,79,80,80,80,80,79,80,80,79,80,80,80,79,80,79,80,80,79,80,79,80,79,80,91,80,79,80,79,80,79,80,79,80,79,80,80,186,0,0,0,0,0,0,564,565,0,0,524,0,564,565,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,1734,1735,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,1746,1747,1748,1749,1750,1751,1391,1386,914,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,463,0,0,464,0,0,0,107,0,0,32,30,33,30,0,31,0,24,0,31,0,32,30,0,0,33,0,33,24,24,33,0,0,34,0,0,24,32,32,31,32,0,0,33,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,1765,1766,1767,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1768,1769,1770,1771,1772,1773,1774,1775,1776,1777,1778,1779,1780,1781,1782,1783,1391,1386,930,897,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,941,942,942,943,0,0,0,0,0,0,0,0,0,34,0,0,31,0,31,30,33,33,0,0,30,0,31,32,0,0,33,56,33,33,30,31,0,0,0,107,0,0,24,33,33,33,30,33,31,33,0,0,107,0,0,0,0,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,898,913,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,777,778,778,779,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1391,1386,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,463,0,0,464,0,0,0,107,0,0,33,30,31,0,32,31,0,31,24,24,33,32,0,0,33,24,0,30,0,33,31,0,0,0,0,0,33,33,32,0,24,0,30,33,0,0,107,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,50,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1377,1372,1401,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,916,0,0,0,0,0,914,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -306,7 +307,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,56,0,0,0,49,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,25,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,25,564,565,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,523,0,0,0,0,0,0,0,564,565,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,523,0,0,0,0,0,0,0,564,565,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,564,565,0,0,0,56,0,0,564,565,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,46,0,0,0, @@ -450,7 +451,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1180,7 +1181,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 </data> </layer> - <layer id="9" name="Collision" width="140" height="140"> + <layer id="9" name="Collision" width="140" height="140" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1292,9 +1293,9 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,2,2,0,0,2,2,2,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,0,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,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,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,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,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,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,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,2,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,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,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,0,0,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,2,0,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,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,2,2,2,2,2,0,0,0,2,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,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,2,2,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,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1324,221 +1325,221 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup id="10" name="Objects"> + <objectgroup id="10" name="Objects" visible="0"> <object id="1" name="North Tulimshar" type="warp" x="1952" y="640" width="160" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="63"/> - <property name="dest_tile_y" value="118"/> + <property name="dest_x" value="63"/> + <property name="dest_y" value="118"/> </properties> </object> <object id="2" name="North Tulimshar" type="warp" x="3232" y="640" width="160" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="103"/> - <property name="dest_tile_y" value="118"/> + <property name="dest_x" value="103"/> + <property name="dest_y" value="118"/> </properties> </object> <object id="3" name="Maggot" type="spawn" x="2592" y="1856" width="800" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="0"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="4" name="Maggot" type="spawn" x="3424" y="1856" width="384" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="0"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="5" name="Maggot" type="spawn" x="3296" y="2208" width="384" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="0"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="6" name="Maggot" type="spawn" x="1952" y="672" width="128" height="512"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="0"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="7" name="Scorpion" type="spawn" x="1984" y="2560" width="800" height="1088"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="12"/> <property name="monster_id" value="1"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="8" name="Maggot" type="spawn" x="3456" y="3552" width="352" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="0"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="9" name="Scorpion" type="spawn" x="1216" y="832" width="352" height="2272"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="1"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="10" name="Scorpion" type="spawn" x="1472" y="2656" width="1600" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="1"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="11" name="RedScorpion" type="spawn" x="992" y="2656" width="640" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="2"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="12" name="SeaSlime" type="spawn" x="1216" y="832" width="288" height="960"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="31"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="13" name="SeaSlime" type="spawn" x="928" y="1760" width="320" height="1312"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="31"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="14" name="Scorpion" type="spawn" x="2592" y="1856" width="1216" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="1"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="15" name="To Snake Desert" type="warp" x="3808" y="3008" width="32" height="96"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="16" name="To Desert Mine Camp" type="warp" x="2944" y="3648" width="32" height="32"> <properties> <property name="dest_map" value="002-3"/> - <property name="dest_tile_x" value="85"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="85"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="17" name="To Desert Mine Camp" type="warp" x="1056" y="3488" width="32" height="32"> <properties> <property name="dest_map" value="002-3"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="35"/> </properties> </object> <object id="18" name="To Weavers Shop" type="warp" x="3488" y="1440" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="75"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="75"/> + <property name="dest_y" value="100"/> </properties> </object> <object id="19" name="To Weavers Shop" type="warp" x="3680" y="1440" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="100"/> </properties> </object> <object id="20" name="To Jeweler" type="warp" x="3168" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="120"/> - <property name="dest_tile_y" value="66"/> + <property name="dest_x" value="120"/> + <property name="dest_y" value="66"/> </properties> </object> <object id="21" name="To Trainer" type="warp" x="3648" y="1120" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="131"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="131"/> </properties> </object> <object id="22" name="To Trainer" type="warp" x="3520" y="928" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="68"/> - <property name="dest_tile_y" value="122"/> + <property name="dest_x" value="68"/> + <property name="dest_y" value="122"/> </properties> </object> <object id="23" name="To Tulimshar Indoor" type="warp" x="2336" y="1120" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="33"/> </properties> </object> <object id="24" name="To KPS" type="warp" x="1824" y="1120" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="120"/> - <property name="dest_tile_y" value="94"/> + <property name="dest_x" value="120"/> + <property name="dest_y" value="94"/> </properties> </object> <object id="25" name="To Tulimshar Indoor" type="warp" x="2144" y="928" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="23"/> - <property name="dest_tile_y" value="109"/> + <property name="dest_x" value="23"/> + <property name="dest_y" value="109"/> </properties> </object> <object id="26" name="To Snake Cave" type="warp" x="3616" y="3424" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="52"/> - <property name="dest_tile_y" value="37"/> + <property name="dest_x" value="52"/> + <property name="dest_y" value="37"/> </properties> </object> <object id="27" name="FireGoblin" type="spawn" x="2016" y="3040" width="672" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="1011"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="28" name="To Sea Cave" type="warp" x="1568" y="640" width="32" height="32"> <properties> <property name="dest_map" value="004-3"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="94"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="94"/> </properties> </object> <object id="29" name="Omar's House" type="warp" x="1824" y="832" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="119"/> - <property name="dest_tile_y" value="131"/> + <property name="dest_x" value="119"/> + <property name="dest_y" value="131"/> </properties> </object> </objectgroup> diff --git a/maps/002-2.tmx b/maps/002-2.tmx index 009664ef..29c484e0 100644 --- a/maps/002-2.tmx +++ b/maps/002-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="149" height="160" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="23"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="149" height="160" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="23"> <properties> <property name="minimap" value="graphics/minimaps/002-2.png"/> <property name="music" value="faith.ogg"/> @@ -1003,120 +1003,120 @@ <object id="1" name="Outside" type="warp" x="1408" y="1088" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="73"/> - <property name="dest_tile_y" value="36"/> + <property name="dest_x" value="73"/> + <property name="dest_y" value="36"/> </properties> </object> <object id="2" name="First Floor" type="warp" x="1376" y="640" width="64" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="45"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="45"/> + <property name="dest_y" value="78"/> </properties> </object> <object id="3" name="First Floor" type="warp" x="1440" y="2528" width="64" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="43"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="43"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="4" name="Penthouse" type="warp" x="1440" y="1760" width="64" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="109"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="109"/> </properties> </object> <object id="5" name="Second Floor" type="warp" x="1408" y="3520" width="64" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="45"/> - <property name="dest_tile_y" value="56"/> + <property name="dest_x" value="45"/> + <property name="dest_y" value="56"/> </properties> </object> <object id="7" name="Outside" type="warp" x="736" y="3520" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="67"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="67"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="9" name="Casino" type="warp" x="1088" y="640" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="79"/> - <property name="dest_tile_y" value="69"/> + <property name="dest_x" value="79"/> + <property name="dest_y" value="69"/> </properties> </object> <object id="10" name="Theatre" type="warp" x="1184" y="640" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="72"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="72"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="11" name="First Floor" type="warp" x="2304" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="37"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="37"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="12" name="First Floor" type="warp" x="2528" y="2240" width="32" height="32"> <properties> <property name="dest_map" value="002-2"/> - <property name="dest_tile_x" value="34"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="34"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="15" name="Outside" type="warp" x="2400" y="3232" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="109"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="109"/> + <property name="dest_y" value="46"/> </properties> </object> <object id="16" name="Outside" type="warp" x="2656" y="3232" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="115"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="115"/> + <property name="dest_y" value="46"/> </properties> </object> <object id="17" name="Outside" type="warp" x="2496" y="4224" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="36"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="36"/> </properties> </object> <object id="18" name="Outside" type="warp" x="2176" y="3872" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="110"/> - <property name="dest_tile_y" value="28"/> + <property name="dest_x" value="110"/> + <property name="dest_y" value="28"/> </properties> </object> <object id="19" name="Outside" type="warp" x="3840" y="2144" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="99"/> - <property name="dest_tile_y" value="44"/> + <property name="dest_x" value="99"/> + <property name="dest_y" value="44"/> </properties> </object> <object id="20" name="Outside" type="warp" x="3840" y="3040" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="57"/> - <property name="dest_tile_y" value="36"/> + <property name="dest_x" value="57"/> + <property name="dest_y" value="36"/> </properties> </object> <object id="22" name="To Outside" type="warp" x="3808" y="4224" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="57"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="57"/> + <property name="dest_y" value="27"/> </properties> </object> </objectgroup> diff --git a/maps/002-3.tmx b/maps/002-3.tmx index 4ac04c03..e08176c2 100644 --- a/maps/002-3.tmx +++ b/maps/002-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="110" height="110" tilewidth="32" tileheight="32" nextobjectid="7"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="110" height="110" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="7"> <properties> <property name="minimap" value="graphics/minimaps/002-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -16,9 +16,8 @@ <tileset firstgid="931" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="1187" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="1235" source="../tilesets/barbarians_outdoor.tsx"/> - <tileset firstgid="1238" source="../tilesets/cave2_bilevel.tsx"/> - <tileset firstgid="1494" source="../tilesets/cave2_sewer_mine_x2.tsx"/> - <layer name="Ground1" width="110" height="110"> + <tileset firstgid="1238" source="../tilesets/cave2_sewer_mine_x2.tsx"/> + <layer id="1" name="Ground1" width="110" height="110"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -132,7 +131,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="110" height="110"> + <layer id="2" name="Ground2" width="110" height="110"> <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, @@ -246,7 +245,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 </data> </layer> - <layer name="Ground3" width="110" height="110"> + <layer id="3" name="Ground3" width="110" height="110"> <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, @@ -360,7 +359,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 </data> </layer> - <layer name="Ground4" width="110" height="110"> + <layer id="4" name="Ground4" width="110" height="110"> <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, @@ -474,7 +473,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 </data> </layer> - <layer name="Fringe" width="110" height="110"> + <layer id="5" name="Fringe" width="110" height="110"> <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, @@ -519,17 +518,17 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,542,543,541,542,543,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,527,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1565,1566,1567,1565,1566,1567,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1548,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,527,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1309,1310,1311,1309,1310,1311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1565,1566,1567,1546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1309,1310,1311,1290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,541,542,543,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1565,1566,1567,1565,1566,1567,1571,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1565,1566,1567,1546,0,1548,1565,1566,1567,1565,1566,1568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1309,1310,1311,1309,1310,1311,1315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1309,1310,1311,1290,0,1292,1309,1310,1311,1309,1310,1312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1189,1190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1571,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -588,7 +587,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 </data> </layer> - <layer name="Over1" width="110" height="110"> + <layer id="6" name="Over1" width="110" height="110"> <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, @@ -702,7 +701,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 </data> </layer> - <layer name="Over2" width="110" height="110"> + <layer id="7" name="Over2" width="110" height="110"> <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, @@ -816,7 +815,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 </data> </layer> - <layer name="Collision" width="110" height="110"> + <layer id="8" name="Collision" width="110" height="110"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -930,26 +929,26 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="9" name="Objects"> <object id="1" name="Deep Caves" type="warp" x="704" y="2784" width="32" height="32"> <properties> <property name="dest_map" value="043-3"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="2" name="To Sand Storm Upper" type="warp" x="2720" y="1632" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="115"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="115"/> </properties> </object> <object id="3" name="To Sand Storm" type="warp" x="1632" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="33"/> - <property name="dest_tile_y" value="110"/> + <property name="dest_x" value="33"/> + <property name="dest_y" value="110"/> </properties> </object> <object id="4" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2368" y="2080" width="32" height="32"/> diff --git a/maps/002-4.tmx b/maps/002-4.tmx index 33063c24..05553cc8 100644 --- a/maps/002-4.tmx +++ b/maps/002-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="128" height="128" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="17"> <properties> <property name="minimap" value="graphics/minimaps/002-4.png"/> <property name="music" value="cavesong.ogg"/> @@ -9,12 +9,12 @@ </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/cave2.tsx"/> - <tileset firstgid="259" source="../tilesets/cave2_x2.tsx"/> - <tileset firstgid="291" source="../tilesets/cave2_sewer_mine.tsx"/> - <tileset firstgid="547" source="../tilesets/cave2_transistions.tsx"/> - <tileset firstgid="803" source="../tilesets/cave2_bilevel.tsx"/> - <tileset firstgid="1059" source="../tilesets/cave2_sewer_mine_x2.tsx"/> - <layer name="Ground1" width="128" height="128"> + <tileset firstgid="131" source="../tilesets/cave2_x2.tsx"/> + <tileset firstgid="163" source="../tilesets/cave2_sewer_mine.tsx"/> + <tileset firstgid="419" source="../tilesets/cave2_transistions.tsx"/> + <tileset firstgid="675" source="../tilesets/cave2_bilevel.tsx"/> + <tileset firstgid="931" source="../tilesets/cave2_sewer_mine_x2.tsx"/> + <layer id="1" name="Ground1" width="128" height="128"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -146,7 +146,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="128" height="128"> + <layer id="2" name="Ground2" width="128" height="128"> <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, @@ -177,78 +177,78 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,4,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,401,402,400,401,402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,417,418,416,417,418,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,432,433,434,432,433,434,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,463,463,463,463,464,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,608,0,0,0,0,610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,272,273,274,272,273,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,288,289,290,288,289,290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,304,305,306,304,305,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,723,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,335,335,335,335,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,480,0,0,0,0,482,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,535,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,336,337,338,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,465,400,401,402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,352,353,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,481,416,417,418,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,463,464,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,481,432,433,434,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,336,337,338,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,401,402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,497,334,515,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,352,353,354,535,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,417,418,535,515,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,463,464,535,535,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,432,433,434,515,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,401,402,400,401,402,466,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,463,464,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,417,418,416,417,418,482,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,608,0,610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,193,194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,407,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,208,209,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,337,272,273,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,225,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,353,288,289,290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,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,335,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,353,304,305,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,208,209,210,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,272,273,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,369,206,387,207,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,225,226,407,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,288,289,290,407,387,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,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,335,336,407,407,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,304,305,306,387,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,272,273,274,272,273,274,338,0,0,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,335,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,288,289,290,288,289,290,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,480,0,482,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,723,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,851,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,723,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,535,535,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,531,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,336,337,338,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,352,353,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,515,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,535,336,337,338,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,535,352,353,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,465,400,401,402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,481,416,417,418,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,481,432,433,434,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,497,334,302,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,608,609,610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,407,407,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,403,192,193,194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,208,209,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,224,225,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,387,192,193,194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,407,208,209,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,407,224,225,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,337,272,273,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,353,288,289,290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,353,304,305,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,369,206,174,207,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,480,481,482,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,465,400,401,402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,481,416,417,418,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,481,432,433,434,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,497,413,414,415,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,535,608,609,610,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,535,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,337,272,273,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,353,288,289,290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,353,304,305,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,369,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,407,480,481,482,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,407,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -278,7 +278,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 </data> </layer> - <layer name="Ground3" width="128" height="128"> + <layer id="3" name="Ground3" width="128" height="128"> <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, @@ -309,10 +309,10 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,515,0,0,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,0,0,0,303,535,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,0,0,0,303,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,445,0,0,0,0,447,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,387,0,0,0,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,0,0,0,175,407,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,0,0,0,175,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,317,0,0,0,0,319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -320,14 +320,14 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,535,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,414,415,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,407,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,403,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,303,509,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,399,413,414,415,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,445,0,447,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,271,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,317,0,319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -341,18 +341,18 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,414,415,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,520,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,445,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,392,393,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,317,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -375,7 +375,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,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -410,7 +410,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 </data> </layer> - <layer name="Ground4" width="128" height="128"> + <layer id="4" name="Ground4" width="128" height="128"> <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, @@ -452,11 +452,11 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,399,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -542,7 +542,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 </data> </layer> - <layer name="Fringe" width="128" height="128"> + <layer id="5" name="Fringe" width="128" height="128"> <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, @@ -578,17 +578,17 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1062,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1130,1131,1132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1130,1131,1132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -615,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1130,1131,1132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,1004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -636,13 +636,13 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1062,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1097,1098,1099,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,969,970,971,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1097,1098,1099,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,969,970,971,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -674,7 +674,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 </data> </layer> - <layer name="Over1" width="128" height="128"> + <layer id="6" name="Over1" width="128" height="128"> <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, @@ -705,48 +705,48 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,261,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,364,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,380,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,27,0,0,25,26,26,26,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,11,26,26,12,0,0,0,0,0,0,11,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,530,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,514,514,513,514,514,546,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,11,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,27,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,514,514,513,514,514,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,370,27,0,0,0,0,0,0,0,0,0,510,0,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,514,513,514,514,513,514,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,401,0,0,0,0,0,402,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,417,386,386,385,386,386,418,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,11,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,27,0,0,0,0,0,364,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,401,0,0,0,0,0,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,417,386,386,385,386,386,418,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,242,27,0,0,0,0,0,0,0,0,0,382,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,401,0,0,0,0,0,0,402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,417,386,385,386,386,385,386,418,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,11,26,27,0,0,0,0,0,0,0,25,12,0,0,11,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,27,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -764,9 +764,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,11,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,26,26,26,26,26,26,26,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,364,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,380,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -774,8 +774,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,261,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,27,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,12,0,0,11,26,26,27,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,26,26,27,0,0,0,0,0,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,11,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -806,7 +806,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 </data> </layer> - <layer name="Over2" width="128" height="128"> + <layer id="7" name="Over2" width="128" height="128"> <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, @@ -839,7 +839,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,526,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,397,398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -857,25 +857,25 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,528,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,544,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,528,0,0,525,526,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,544,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,821,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,526,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,400,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,416,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,400,0,0,397,398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,416,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,397,398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,364,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,837,0,0,0,0,0,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,837,0,528,0,0,528,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,837,0,544,0,0,544,0,835,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,837,0,0,0,0,0,0,851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,867,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,709,0,0,0,0,0,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,709,0,400,0,0,400,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,709,0,416,0,0,416,0,707,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,709,0,0,0,0,0,0,723,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -897,15 +897,15 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,526,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,397,398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,803,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,675,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,691,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -938,7 +938,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 </data> </layer> - <layer name="Over3" width="128" height="128"> + <layer id="8" name="Over3" width="128" height="128"> <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, @@ -971,7 +971,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,541,542,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1001,7 +1001,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,804,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,676,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1029,7 +1029,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,541,542,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,414,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1070,7 +1070,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 </data> </layer> - <layer name="Collision" width="128" height="128"> + <layer id="9" name="Collision" width="128" height="128"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1202,126 +1202,126 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Mining Camp" type="warp" x="1184" y="928" width="32" height="32"> + <objectgroup id="10" name="Objects" visible="0"> + <object id="1" name="To Mining Camp" type="warp" x="1184" y="928" width="32" height="32"> <properties> <property name="dest_map" value="002-3"/> - <property name="dest_tile_x" value="82"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="82"/> + <property name="dest_y" value="30"/> </properties> </object> - <object name="CaveMaggot" type="spawn" x="1024" y="1024" width="512" height="384"> + <object id="2" name="CaveMaggot" type="spawn" x="1024" y="1024" width="512" height="384"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="54"/> </properties> </object> - <object name="AngryFireGoblin" type="spawn" x="2656" y="992" width="576" height="672"> + <object id="3" name="AngryFireGoblin" type="spawn" x="2656" y="992" width="576" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="106"/> </properties> </object> - <object name="CaveMaggot" type="spawn" x="1888" y="864" width="832" height="576"> + <object id="4" name="CaveMaggot" type="spawn" x="1888" y="864" width="832" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="54"/> </properties> </object> - <object name="AngryFireGoblin" type="spawn" x="2080" y="3136" width="288" height="192"> + <object id="5" name="AngryFireGoblin" type="spawn" x="2080" y="3136" width="288" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="106"/> </properties> </object> - <object name="AngryScorpion" type="spawn" x="1760" y="1440" width="864" height="800"> + <object id="6" name="AngryScorpion" type="spawn" x="1760" y="1440" width="864" height="800"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="55"/> </properties> </object> - <object name="AngryScorpion" type="spawn" x="1504" y="1632" width="160" height="512"> + <object id="7" name="AngryScorpion" type="spawn" x="1504" y="1632" width="160" height="512"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="55"/> </properties> </object> - <object name="AngryScorpion" type="spawn" x="992" y="2080" width="512" height="736"> + <object id="8" name="AngryScorpion" type="spawn" x="992" y="2080" width="512" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="55"/> </properties> </object> - <object name="CaveMaggot" type="spawn" x="1760" y="2240" width="224" height="576"> + <object id="9" name="CaveMaggot" type="spawn" x="1760" y="2240" width="224" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="54"/> </properties> </object> - <object name="AngryScorpion" type="spawn" x="2688" y="1664" width="384" height="1056"> + <object id="10" name="AngryScorpion" type="spawn" x="2688" y="1664" width="384" height="1056"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="55"/> </properties> </object> - <object name="CaveMaggot" type="spawn" x="2400" y="2720" width="640" height="576"> + <object id="11" name="CaveMaggot" type="spawn" x="2400" y="2720" width="640" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="54"/> </properties> </object> - <object name="AngryFireGoblin" type="spawn" x="1984" y="2240" width="704" height="480"> + <object id="12" name="AngryFireGoblin" type="spawn" x="1984" y="2240" width="704" height="480"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="106"/> </properties> </object> - <object name="AngryScorpion" type="spawn" x="1984" y="2720" width="384" height="416"> + <object id="13" name="AngryScorpion" type="spawn" x="1984" y="2720" width="384" height="416"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="55"/> </properties> </object> - <object name="CaveMaggot" type="spawn" x="1760" y="2848" width="224" height="448"> + <object id="14" name="CaveMaggot" type="spawn" x="1760" y="2848" width="224" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="54"/> </properties> </object> - <object name="AngryScorpion" type="spawn" x="1984" y="3136" width="96" height="192"> + <object id="15" name="AngryScorpion" type="spawn" x="1984" y="3136" width="96" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="55"/> </properties> </object> - <object name="graphics/particles/warparea.particle.xml" type="particle_effect" x="2176" y="3136" width="32" height="32"/> + <object id="16" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="2176" y="3136" width="32" height="32"/> </objectgroup> </map> diff --git a/maps/002-5.tmx b/maps/002-5.tmx index 56cbb571..fa89e401 100644 --- a/maps/002-5.tmx +++ b/maps/002-5.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="29"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="29"> <properties> <property name="minimap" value="graphics/minimaps/002-5.png"/> <property name="music" value="cavesong.ogg"/> @@ -1212,142 +1212,142 @@ <object id="9" name="To Second Level" type="warp" x="1088" y="3136" width="32" height="32"> <properties> <property name="dest_map" value="002-4"/> - <property name="dest_tile_x" value="68"/> - <property name="dest_tile_y" value="99"/> + <property name="dest_x" value="68"/> + <property name="dest_y" value="99"/> </properties> </object> <object id="10" name="AngryFireGoblin" type="spawn" x="992" y="2752" width="416" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="106"/> </properties> </object> <object id="11" name="CaveMaggot" type="spawn" x="1024" y="2272" width="128" height="384"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="54"/> </properties> </object> <object id="12" name="AngryScorpion" type="spawn" x="1184" y="2112" width="256" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="55"/> </properties> </object> <object id="13" name="Archant" type="spawn" x="992" y="1152" width="608" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="58"/> </properties> </object> <object id="14" name="Archant" type="spawn" x="1760" y="3040" width="96" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="58"/> </properties> </object> <object id="15" name="YellowSlime" type="spawn" x="1984" y="3168" width="416" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="5"/> </properties> </object> <object id="16" name="Archant" type="spawn" x="2912" y="2496" width="64" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="58"/> </properties> </object> <object id="17" name="Archant" type="spawn" x="2848" y="2944" width="64" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="58"/> </properties> </object> <object id="18" name="Archant" type="spawn" x="2368" y="2432" width="64" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="58"/> </properties> </object> <object id="19" name="Archant" type="spawn" x="2976" y="2240" width="96" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="58"/> </properties> </object> <object id="20" name="YellowSlime" type="spawn" x="2784" y="1920" width="224" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="5"/> </properties> </object> <object id="21" name="Archant" type="spawn" x="2368" y="1056" width="64" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="58"/> </properties> </object> <object id="22" name="Archant" type="spawn" x="2688" y="992" width="64" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="58"/> </properties> </object> <object id="23" name="Archant" type="spawn" x="2688" y="1408" width="64" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="58"/> </properties> </object> <object id="24" name="Archant" type="spawn" x="3168" y="1152" width="64" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="58"/> </properties> </object> <object id="25" name="YellowSlime" type="spawn" x="2848" y="1184" width="288" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="5"/> </properties> </object> <object id="26" name="AngryFireGoblin" type="spawn" x="1920" y="1312" width="192" height="1408"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="106"/> </properties> diff --git a/maps/003-1.tmx b/maps/003-1.tmx index bd80284a..d85b9e5c 100644 --- a/maps/003-1.tmx +++ b/maps/003-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="20"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="20"> <properties> <property name="minimap" value="graphics/minimaps/003-1.png"/> <property name="music" value="faith.ogg"/> diff --git a/maps/003-4.tmx b/maps/003-4.tmx index 16b679f7..d4ee8527 100644 --- a/maps/003-4.tmx +++ b/maps/003-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="190" height="138" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="12"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="190" height="138" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="12"> <properties> <property name="minimap" value="graphics/minimaps/003-4.png"/> <property name="music" value="faith.ogg"/> @@ -711,7 +711,11 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -720,13 +724,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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> @@ -1161,61 +1161,61 @@ <object id="1" name="To Exit" type="warp" x="5504" y="2400" width="32" height="160"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="32"/> - <property name="dest_tile_y" value="66"/> + <property name="dest_x" value="32"/> + <property name="dest_y" value="66"/> </properties> </object> <object id="2" name="To Beach" type="warp" x="4480" y="608" width="96" height="32"> <properties> <property name="dest_map" value="004-1"/> - <property name="dest_tile_x" value="37"/> - <property name="dest_tile_y" value="110"/> + <property name="dest_x" value="37"/> + <property name="dest_y" value="110"/> </properties> </object> <object id="3" name="GiantMaggot" type="spawn" x="4608" y="640" width="928" height="3104"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="4"/> </properties> </object> <object id="4" name="SeaSlime" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="31"/> </properties> </object> <object id="5" name="SeaSlime" type="spawn" x="3488" y="640" width="736" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="31"/> </properties> </object> <object id="6" name="GreenSlime" type="spawn" x="2144" y="576" width="3392" height="3264"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="35"/> <property name="monster_id" value="3"/> </properties> </object> <object id="7" name="RedScorpion" type="spawn" x="3072" y="1088" width="2464" height="2304"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="2"/> </properties> </object> <object id="8" name="MountainSnake" type="spawn" x="960" y="768" width="352" height="128"> <properties> - <property name="eA_death" value="600000"/> - <property name="eA_spawn" value="700000"/> + <property name="death" value="600000"/> + <property name="spawn" value="700000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="24"/> </properties> @@ -1223,8 +1223,8 @@ <object id="11" name="To Beach" type="warp" x="3584" y="3744" width="128" height="32"> <properties> <property name="dest_map" value="043-1"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="20"/> </properties> </object> </objectgroup> diff --git a/maps/004-1.tmx b/maps/004-1.tmx index 88d71a3c..52baf307 100644 --- a/maps/004-1.tmx +++ b/maps/004-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="117" height="133" tilewidth="32" tileheight="32" infinite="0" nextobjectid="14"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="117" height="133" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="14"> <properties> <property name="minimap" value="graphics/minimaps/004-1.png"/> <property name="music" value="faith.ogg"/> @@ -18,7 +18,7 @@ <tileset firstgid="1137" source="../tilesets/water.tsx"/> <tileset firstgid="1302" source="../tilesets/waterflow.tsx"/> <tileset firstgid="1374" source="../tilesets/signs_x2.tsx"/> - <layer name="Ground1" width="117" height="133"> + <layer id="1" name="Ground1" width="117" height="133"> <data encoding="csv"> 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1297,1271,3,150,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,358,359,360,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,71,3,3,213,217,3,3,3,3,3,3,3,403,404,405,3,3,725,676,677,725,725,774,725, 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1282,3,150,134,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,358,359,360,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,10,3,3,213,217,3,648,647,648,647,648,3,403,404,405,3,3,3,3,3,3,474,475,475, @@ -110,9 +110,9 @@ 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,3,3,232,230,404,438,389,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,403,404,404,404,404,404, 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1297,1271,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,3,3,248,246,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,439,404,404,404,404,404, 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1297,1298,1271,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,3,3,332,332,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,404,404,404,404,404,404, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,213,217,364,347,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,3,404,404,404,404,404,404, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,118,3,3,3,3,3,3,3,3,3,3,3,3,3,62,3,3,3,3,3,3,3,120,135,135,135,3,484,485,213,217,364,363,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,3,403,404,404,404,404,404, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,118,10,120,121,3,3,3,3,3,3,3,3,134,118,3,474,475,476,3,3,3,3,3,120,121,135,135,135,118,3,3,3,65,120,136,151,151,151,3,484,485,213,217,3,3,459,459,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,403,404,404,404,404,404, +1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,484,485,213,217,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,3,404,404,404,404,404,404, +1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,118,3,3,3,3,3,3,3,3,3,3,3,3,3,62,3,3,3,3,3,3,3,120,135,135,135,3,484,485,213,217,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,364,3,403,404,404,404,404,404, +1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,118,10,120,121,3,3,3,3,3,3,3,3,134,118,3,474,475,476,3,3,3,3,3,120,121,135,135,135,118,3,3,3,65,120,136,151,151,151,3,484,485,213,217,459,459,459,459,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,403,404,404,404,404,404, 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1267,1286,3,3,3,3,3,3,3,3,3,3,3,134,135,136,137,3,3,3,3,352,353,354,149,150,134,3,490,491,492,3,120,121,38,135,136,137,151,151,151,134,135,135,38,135,136,152,167,167,167,154,484,485,213,217,3,3,474,475,476,460,3,3,3,3,3,3,3,3,3,3,3,3,442,442,442,3,3,403,404,404,404,404,404, 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,3,149,150,151,152,153,154,3,3,367,368,369,3,165,166,150,3,3,3,392,393,136,137,54,151,152,153,167,167,167,150,151,151,54,151,152,168,3,3,3,3,484,485,213,217,3,3,474,475,475,476,3,3,3,3,3,3,3,3,3,3,3,3,442,442,459,459,459,403,404,404,404,404,404, 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1300,1300,1282,3,3,3,3,3,3,3,3,3,3,3,165,166,167,168,169,3,3,3,383,384,385,3,3,3,166,38,135,135,408,409,152,153,70,167,168,169,3,3,3,166,167,167,70,167,168,3,3,3,3,3,3,485,213,217,3,3,490,491,491,492,3,3,3,648,650,648,781,690,706,689,688,782,3,442,474,475,476,403,404,404,404,404,404, @@ -155,7 +155,7 @@ 1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,3,3,3,3,3,3,3,63,3,3,3,458,459,474,475,476,3,458,459,460,3,352,353,354,3,3,3,3,396,397,430,3,3,3,3,3,3,3,150,150,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,442,442,442,442,3,3,3,459,459,3,3,490,491,491,3,3,444,446,443,430,3,396,396,397,429,414,412,412,445,3,3,3,368,369,3,484,3,3,3,3,3,403,404,404,404,404,404 </data> </layer> - <layer name="Ground2" width="117" height="133"> + <layer id="2" name="Ground2" width="117" height="133"> <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,1279,1274,1010,977,133,117,0,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,104,0,0,0,0,0,0,0,0,0,0,0,0,565,0,606,0,675,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1275,1259,994,133,133,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,105,0,0,0,0,0,707,0,0,0,0,0,708,565,0,606,0,691,692,692,693,692,692,692,692, @@ -247,9 +247,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,1279,1274,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,1010,977,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1275,1259,1010,1011,977,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1275,1258,1259,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,339,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1264,1274,994,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,106,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,122,0,0,0,0,362,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,355,356,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1265,1260,1289,994,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,122,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,138,0,0,0,0,378,379,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,371,372,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1275,1258,1259,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,339,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1280,1264,1274,994,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,106,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,355,356,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1265,1260,1289,994,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,122,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,138,0,0,0,0,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,371,372,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,978,993,0,0,0,0,0,0,0,0,0,0,133,0,0,0,0,138,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1265,1294,1274,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1265,1260,1288,1289,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,723,0,0,0,0,0,0,0,0,0,724,0,0,0,0,0,0,0,0,0,934, @@ -292,7 +292,7 @@ 0,0,0,0,0,1279,1274,994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,133,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="117" height="133"> + <layer id="3" name="Ground3" width="117" height="133"> <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,1376,0,0,0, @@ -429,7 +429,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 </data> </layer> - <layer name="Ground4" width="117" height="133"> + <layer id="4" name="Ground4" width="117" height="133"> <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,1393,0,0,0, @@ -566,7 +566,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 </data> </layer> - <layer name="Fringe" width="117" height="133"> + <layer id="5" name="Fringe" width="117" height="133"> <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, @@ -598,8 +598,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,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,515,516,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,516,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -662,7 +662,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,517,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,935,936,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,900,901,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -683,7 +683,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,931,932,933,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,521, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,931,932,933,0,0,0,0,0,0,0,0,0,0,0, @@ -703,7 +703,7 @@ 0,0,0,0,0,0,934,935,936,0,0,0,934,935,936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,521 </data> </layer> - <layer name="Over1" width="117" height="133"> + <layer id="6" name="Over1" width="117" height="133"> <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,643,644,644,644,645,645,646,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -840,7 +840,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,3,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="117" height="133"> + <layer id="7" name="Over2" width="117" height="133"> <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, @@ -977,7 +977,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 </data> </layer> - <layer name="Collision" width="117" height="133"> + <layer id="8" name="Collision" width="117" height="133" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1009,8 +1009,8 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,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,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,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, @@ -1114,59 +1114,59 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="9" name="Objects" visible="0"> <object id="1" name="SeaSlime" type="spawn" x="1120" y="1376" width="288" height="960"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="31"/> </properties> </object> <object id="2" name="SeaSlime" type="spawn" x="928" y="2016" width="320" height="1312"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="31"/> </properties> </object> <object id="3" name="SeaSlime" type="spawn" x="736" y="3072" width="384" height="480"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="31"/> </properties> </object> <object id="4" name="GiantMaggot" type="spawn" x="1856" y="3008" width="896" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="4"/> </properties> </object> <object id="5" name="RedScorpion" type="spawn" x="2112" y="1408" width="704" height="1600"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="13"/> <property name="monster_id" value="2"/> </properties> </object> <object id="6" name="GiantMaggot" type="Spawn" x="1888" y="640" width="640" height="352"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="4"/> </properties> </object> <object id="7" name="BlackScorpion" type="spawn" x="2944" y="832" width="96" height="128"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="7"/> </properties> @@ -1174,15 +1174,15 @@ <object id="12" name="To Beach" type="warp" x="2144" y="608" width="96" height="32"> <properties> <property name="dest_map" value="041-1"/> - <property name="dest_tile_x" value="101"/> - <property name="dest_tile_y" value="94"/> + <property name="dest_x" value="101"/> + <property name="dest_y" value="94"/> </properties> </object> <object id="13" name="To Beach" type="warp" x="1152" y="3552" width="96" height="32"> <properties> <property name="dest_map" value="003-4"/> - <property name="dest_tile_x" value="141"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="141"/> + <property name="dest_y" value="20"/> </properties> </object> </objectgroup> diff --git a/maps/004-3.tmx b/maps/004-3.tmx index 2eb651e1..fd07cad2 100644 --- a/maps/004-3.tmx +++ b/maps/004-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" nextobjectid="15"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="15"> <properties> <property name="minimap" value="graphics/minimaps/004-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -13,7 +13,7 @@ <tileset firstgid="675" source="../tilesets/cave2_sewer_mine_x2.tsx"/> <tileset firstgid="755" source="../tilesets/cave2_transistions.tsx"/> <tileset firstgid="1011" source="../tilesets/cave2_sewer_mine_x4.tsx"/> - <layer name="Ground1" width="120" height="120"> + <layer id="1" name="Ground1" width="120" height="120"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -137,7 +137,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="120" height="120"> + <layer id="2" name="Ground2" width="120" height="120"> <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, @@ -261,7 +261,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="Ground3" width="120" height="120"> + <layer id="3" name="Ground3" width="120" height="120"> <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, @@ -385,7 +385,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="Ground4" width="120" height="120"> + <layer id="4" name="Ground4" width="120" height="120"> <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, @@ -509,7 +509,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="120"> + <layer id="5" name="Fringe" width="120" height="120"> <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, @@ -633,7 +633,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="Over1" width="120" height="120"> + <layer id="6" name="Over1" width="120" height="120"> <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, @@ -757,7 +757,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="120"> + <layer id="7" name="Collision" width="120" height="120"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -881,108 +881,108 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="8" name="Objects"> <object id="1" name="To West Beach" type="warp" x="768" y="3040" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="2" name="To Pirate Caves" type="warp" x="1568" y="2560" width="32" height="32"> <properties> <property name="dest_map" value="004-4"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="83"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="83"/> </properties> </object> <object id="3" name="To Pirate Caves" type="warp" x="992" y="2336" width="32" height="32"> <properties> <property name="dest_map" value="004-4"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="70"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="70"/> </properties> </object> <object id="4" name="To Pirate Caves" type="warp" x="1568" y="1792" width="32" height="32"> <properties> <property name="dest_map" value="004-4"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="51"/> </properties> </object> <object id="5" name="To Pirate Caves" type="warp" x="2880" y="2048" width="32" height="32"> <properties> <property name="dest_map" value="004-4"/> - <property name="dest_tile_x" value="90"/> - <property name="dest_tile_y" value="68"/> + <property name="dest_x" value="90"/> + <property name="dest_y" value="68"/> </properties> </object> <object id="6" name="To West Beach House" type="warp" x="2560" y="704" width="32" height="32"> <properties> <property name="dest_map" value="021-3"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="142"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="142"/> </properties> </object> <object id="7" name="To Pirate Caves" type="warp" x="2464" y="1280" width="32" height="32"> <properties> <property name="dest_map" value="004-4"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="34"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="34"/> </properties> </object> <object id="8" name="Thug" type="spawn" x="1280" y="2176" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> <object id="9" name="Swashbuckler" type="spawn" x="1280" y="2176" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="118"/> </properties> </object> <object id="10" name="Grenadier" type="spawn" x="1280" y="2176" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> <object id="11" name="Thug" type="spawn" x="768" y="2176" width="288" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> <object id="12" name="Thug" type="spawn" x="2176" y="1888" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> <object id="13" name="Swashbuckler" type="spawn" x="1152" y="1216" width="256" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="118"/> </properties> </object> <object id="14" name="Grenadier" type="spawn" x="2176" y="1888" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> diff --git a/maps/004-4.tmx b/maps/004-4.tmx index 555db1a2..57063023 100644 --- a/maps/004-4.tmx +++ b/maps/004-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="120" height="120" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="16"> <properties> <property name="minimap" value="graphics/minimaps/004-4.png"/> <property name="music" value="cavesong.ogg"/> @@ -14,7 +14,7 @@ <tileset firstgid="755" source="../tilesets/cave2_transistions.tsx"/> <tileset firstgid="1011" source="../tilesets/cave2_sewer_mine_x3.tsx"/> <tileset firstgid="1023" source="../tilesets/cave2_sewer_mine_x4.tsx"/> - <layer name="Ground1" width="120" height="120"> + <layer id="1" name="Ground1" width="120" height="120"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -138,7 +138,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="120" height="120"> + <layer id="2" name="Ground2" width="120" height="120"> <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, @@ -262,7 +262,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="Ground3" width="120" height="120"> + <layer id="3" name="Ground3" width="120" height="120"> <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, @@ -386,7 +386,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="120"> + <layer id="4" name="Fringe" width="120" height="120"> <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, @@ -510,7 +510,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="Over1" width="120" height="120"> + <layer id="5" name="Over1" width="120" height="120"> <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, @@ -634,7 +634,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="120"> + <layer id="6" name="Collision" width="120" height="120"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -758,117 +758,117 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Pirate Caves" type="warp" x="1568" y="2592" width="32" height="32"> + <objectgroup id="7" name="Objects" visible="0"> + <object id="1" name="To Pirate Caves" type="warp" x="1568" y="2592" width="32" height="32"> <properties> <property name="dest_map" value="004-3"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="76"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="76"/> </properties> </object> - <object name="To Pirate Caves" type="warp" x="992" y="2304" width="32" height="32"> + <object id="2" name="To Pirate Caves" type="warp" x="992" y="2304" width="32" height="32"> <properties> <property name="dest_map" value="004-3"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="74"/> </properties> </object> - <object name="To Pirate Caves" type="warp" x="1568" y="1696" width="32" height="32"> + <object id="3" name="To Pirate Caves" type="warp" x="1568" y="1696" width="32" height="32"> <properties> <property name="dest_map" value="004-3"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="57"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="57"/> </properties> </object> - <object name="To Pirate Caves" type="warp" x="2880" y="2240" width="32" height="32"> + <object id="4" name="To Pirate Caves" type="warp" x="2880" y="2240" width="32" height="32"> <properties> <property name="dest_map" value="004-3"/> - <property name="dest_tile_x" value="90"/> - <property name="dest_tile_y" value="66"/> + <property name="dest_x" value="90"/> + <property name="dest_y" value="66"/> </properties> </object> - <object name="To Pirates Den" type="warp" x="768" y="2048" width="32" height="32"> + <object id="5" name="To Pirates Den" type="warp" x="768" y="2048" width="32" height="32"> <properties> <property name="dest_map" value="004-5"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="67"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="67"/> </properties> </object> - <object name="To Pirate Caves" type="warp" x="2496" y="1024" width="32" height="32"> + <object id="6" name="To Pirate Caves" type="warp" x="2496" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="004-3"/> - <property name="dest_tile_x" value="77"/> - <property name="dest_tile_y" value="38"/> + <property name="dest_x" value="77"/> + <property name="dest_y" value="38"/> </properties> </object> - <object name="Grenadier" type="spawn" x="1088" y="1664" width="192" height="672"> + <object id="7" name="Grenadier" type="spawn" x="1088" y="1664" width="192" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> - <object name="Swashbuckler" type="spawn" x="1120" y="1632" width="192" height="704"> + <object id="8" name="Swashbuckler" type="spawn" x="1120" y="1632" width="192" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="118"/> </properties> </object> - <object name="Thug" type="spawn" x="1792" y="1568" width="416" height="256"> + <object id="9" name="Thug" type="spawn" x="1792" y="1568" width="416" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> - <object name="Thug" type="spawn" x="896" y="2688" width="416" height="256"> + <object id="10" name="Thug" type="spawn" x="896" y="2688" width="416" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> - <object name="Thug" type="spawn" x="1088" y="1632" width="224" height="736"> + <object id="11" name="Thug" type="spawn" x="1088" y="1632" width="224" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> - <object name="Swashbuckler" type="spawn" x="928" y="2720" width="352" height="224"> + <object id="12" name="Swashbuckler" type="spawn" x="928" y="2720" width="352" height="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="118"/> </properties> </object> - <object name="Swashbuckler" type="spawn" x="1856" y="1568" width="352" height="224"> + <object id="13" name="Swashbuckler" type="spawn" x="1856" y="1568" width="352" height="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="118"/> </properties> </object> - <object name="Grenadier" type="spawn" x="1824" y="1600" width="384" height="160"> + <object id="14" name="Grenadier" type="spawn" x="1824" y="1600" width="384" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> - <object name="Grenadier" type="spawn" x="928" y="2752" width="352" height="160"> + <object id="15" name="Grenadier" type="spawn" x="928" y="2752" width="352" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> diff --git a/maps/004-5.tmx b/maps/004-5.tmx index 90c927c2..c8329b5c 100644 --- a/maps/004-5.tmx +++ b/maps/004-5.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="14"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="14"> <properties> <property name="minimap" value="graphics/minimaps/004-5.png"/> <property name="music" value="cavesong.ogg"/> @@ -763,102 +763,102 @@ <object id="1" name="To Pirates Den" type="warp" x="768" y="2080" width="32" height="32"> <properties> <property name="dest_map" value="004-4"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="62"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="62"/> </properties> </object> <object id="2" name="Grenadier" type="spawn" x="1216" y="2176" width="224" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> <object id="3" name="Swashbuckler" type="spawn" x="1216" y="2208" width="256" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="118"/> </properties> </object> <object id="4" name="Thug" type="spawn" x="1152" y="2208" width="288" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> <object id="5" name="Grenadier" type="spawn" x="1024" y="2688" width="224" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> <object id="6" name="Thug" type="spawn" x="960" y="2720" width="288" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> <object id="7" name="Swashbuckler" type="spawn" x="1024" y="2720" width="256" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="118"/> </properties> </object> <object id="8" name="Grenadier" type="spawn" x="1632" y="1152" width="224" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> <object id="9" name="Thug" type="spawn" x="1568" y="1184" width="288" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> <object id="10" name="Swashbuckler" type="spawn" x="1632" y="1184" width="256" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="118"/> </properties> </object> <object id="11" name="Grenadier" type="spawn" x="2496" y="1152" width="224" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> <object id="12" name="Thug" type="spawn" x="2432" y="1184" width="288" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="117"/> </properties> </object> <object id="13" name="Swashbuckler" type="spawn" x="2496" y="1184" width="256" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="118"/> </properties> diff --git a/maps/005-3.tmx b/maps/005-3.tmx index f8a5f01a..b9e5cb50 100644 --- a/maps/005-3.tmx +++ b/maps/005-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="156" height="123" tilewidth="32" tileheight="32" nextobjectid="23"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="156" height="123" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="23"> <properties> <property name="minimap" value="graphics/minimaps/005-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -12,7 +12,7 @@ <tileset firstgid="131" source="../tilesets/cave2_x2.tsx"/> <tileset firstgid="163" source="../tilesets/cave2_bilevel.tsx"/> <tileset firstgid="419" source="../tilesets/cave2_sewer_mine.tsx"/> - <layer name="Ground1" width="156" height="123"> + <layer id="1" name="Ground1" width="156" height="123"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -139,7 +139,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="156" height="123"> + <layer id="2" name="Ground2" width="156" height="123"> <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, @@ -266,7 +266,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 </data> </layer> - <layer name="Fringe" width="156" height="123"> + <layer id="3" name="Fringe" width="156" height="123"> <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, @@ -393,7 +393,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 </data> </layer> - <layer name="Over1" width="156" height="123"> + <layer id="4" name="Over1" width="156" height="123"> <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, @@ -520,7 +520,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 </data> </layer> - <layer name="Over2" width="156" height="123"> + <layer id="5" name="Over2" width="156" height="123"> <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, @@ -647,7 +647,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 </data> </layer> - <layer name="Collision" width="156" height="123"> + <layer id="6" name="Collision" width="156" height="123"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -774,62 +774,62 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="7" name="Objects" visible="0"> <object id="1" name="To Outside" type="warp" x="1664" y="1120" width="32" height="32"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="113"/> - <property name="dest_tile_y" value="109"/> + <property name="dest_x" value="113"/> + <property name="dest_y" value="109"/> </properties> </object> <object id="2" name="Snake Mountain" type="warp" x="2016" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="89"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="89"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="3" name="Snake Mountain" type="warp" x="2720" y="1632" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="125"/> - <property name="dest_tile_y" value="65"/> + <property name="dest_x" value="125"/> + <property name="dest_y" value="65"/> </properties> </object> <object id="4" name="To Outside" type="warp" x="2752" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="55"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="55"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="5" name="To Outside" type="warp" x="2336" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="69"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="69"/> </properties> </object> <object id="6" name="Snake" type="spawn" x="1120" y="1120" width="1568" height="1856"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="50"/> <property name="monster_id" value="8"/> </properties> </object> <object id="7" name="BlackScorpion" type="spawn" x="960" y="1280" width="1728" height="1600"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="7"/> </properties> </object> <object id="8" name="GiantMaggot" type="spawn" x="960" y="1504" width="1888" height="1376"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="4"/> </properties> @@ -837,29 +837,29 @@ <object id="9" name="Sandy Dungeon" type="warp" x="2496" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="043-3"/> - <property name="dest_tile_x" value="116"/> - <property name="dest_tile_y" value="37"/> + <property name="dest_x" value="116"/> + <property name="dest_y" value="37"/> </properties> </object> <object id="10" name="Sandy Dungeon" type="warp" x="1056" y="2688" width="32" height="32"> <properties> <property name="dest_map" value="043-3"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="35"/> </properties> </object> <object id="11" name="Troll" type="spawn" x="2880" y="704" width="352" height="1984"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="1054"/> </properties> </object> <object id="12" name="Troll" type="spawn" x="672" y="640" width="2080" height="416"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="1054"/> </properties> @@ -867,15 +867,15 @@ <object id="13" name="To Outside" type="warp" x="3424" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="78"/> </properties> </object> <object id="14" name="Witch Cave" type="warp" x="864" y="1312" width="32" height="32"> <properties> <property name="dest_map" value="043-5"/> - <property name="dest_tile_x" value="126"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="126"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="15" name="graphics/particles/flame.particle.xml" type="particle_effect" x="768" y="1184" width="32" height="32"/> @@ -887,15 +887,15 @@ <object id="21" name="Back to path" type="warp" x="3232" y="960" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="101"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="101"/> + <property name="dest_y" value="35"/> </properties> </object> <object id="22" name="Back to path" type="warp" x="3520" y="2528" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="110"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="110"/> + <property name="dest_y" value="75"/> </properties> </object> </objectgroup> diff --git a/maps/006-1.tmx b/maps/006-1.tmx index ad879505..68af44d3 100644 --- a/maps/006-1.tmx +++ b/maps/006-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="52"> <properties> <property name="minimap" value="graphics/minimaps/006-1.png"/> <property name="music" value="faith.ogg"/> @@ -12,7 +12,7 @@ <tileset firstgid="563" source="../tilesets/desert_x3.tsx"/> <tileset firstgid="595" source="../tilesets/docks.tsx"/> <tileset firstgid="755" source="../tilesets/trans_woodland_desert.tsx"/> - <layer name="Ground1" width="140" height="140"> + <layer id="1" name="Ground1" width="140" height="140"> <data encoding="csv"> 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,134,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,150,150,134,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,149,150,134,135,135,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,134,118,3,3,3,3,3,3,3,166,150,150,134,118,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, @@ -156,7 +156,7 @@ 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,120,136,152,151,152,168,3,3,3,3,3,3,3,3,120,136,152,168,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3 </data> </layer> - <layer name="Ground2" width="140" height="140"> + <layer id="2" name="Ground2" width="140" height="140"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,564,565,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -170,7 +170,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,564,565,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,564,565,0,0,524,0,564,565,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,0,0,0,0,0,0,0,0,0,0,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,47,0,0,0,0,0,0,0,0,0,524,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,61,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -300,7 +300,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 </data> </layer> - <layer name="Ground3" width="140" height="140"> + <layer id="3" name="Ground3" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -314,7 +314,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,564,565,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -444,7 +444,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 </data> </layer> - <layer name="Fringe" width="140" height="140"> + <layer id="4" name="Fringe" width="140" height="140"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -588,7 +588,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 </data> </layer> - <layer name="Over1" width="140" height="140"> + <layer id="5" name="Over1" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -732,7 +732,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,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="140" height="140"> + <layer id="6" name="Over2" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -876,7 +876,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 </data> </layer> - <layer name="Collision" width="140" height="140"> + <layer id="7" name="Collision" width="140" height="140"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1020,383 +1020,383 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Desert Mountain Cave" type="warp" x="1280" y="832" width="32" height="32"> + <objectgroup id="8" name="Objects" visible="0"> + <object id="1" name="To Desert Mountain Cave" type="warp" x="1280" y="832" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="40"/> - <property name="dest_tile_y" value="28"/> + <property name="dest_x" value="40"/> + <property name="dest_y" value="28"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="1920" y="1856" width="32" height="32"> + <object id="2" name="To Desert Mountain Cave" type="warp" x="1920" y="1856" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="70"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="70"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="1984" y="960" width="32" height="32"> + <object id="3" name="To Desert Mountain Cave" type="warp" x="1984" y="960" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="62"/> - <property name="dest_tile_y" value="32"/> + <property name="dest_x" value="62"/> + <property name="dest_y" value="32"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="1760" y="864" width="32" height="32"> + <object id="4" name="To Desert Mountain Cave" type="warp" x="1760" y="864" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="55"/> - <property name="dest_tile_y" value="29"/> + <property name="dest_x" value="55"/> + <property name="dest_y" value="29"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="2464" y="1408" width="32" height="32"> + <object id="5" name="To Desert Mountain Cave" type="warp" x="2464" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="77"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="77"/> + <property name="dest_y" value="46"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="2752" y="768" width="32" height="32"> + <object id="6" name="To Desert Mountain Cave" type="warp" x="2752" y="768" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="86"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="86"/> + <property name="dest_y" value="26"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="2912" y="768" width="32" height="32"> + <object id="7" name="To Desert Mountain Cave" type="warp" x="2912" y="768" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="26"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="3136" y="1472" width="32" height="32"> + <object id="8" name="To Desert Mountain Cave" type="warp" x="3136" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="104"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="104"/> + <property name="dest_y" value="46"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="3648" y="704" width="32" height="32"> + <object id="9" name="To Desert Mountain Cave" type="warp" x="3648" y="704" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="122"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="122"/> + <property name="dest_y" value="26"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="3648" y="1568" width="32" height="32"> + <object id="10" name="To Desert Mountain Cave" type="warp" x="3648" y="1568" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="51"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="3264" y="1696" width="32" height="32"> + <object id="11" name="To Desert Mountain Cave" type="warp" x="3264" y="1696" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="110"/> - <property name="dest_tile_y" value="58"/> + <property name="dest_x" value="110"/> + <property name="dest_y" value="58"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="3744" y="1824" width="32" height="32"> + <object id="12" name="To Desert Mountain Cave" type="warp" x="3744" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="125"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="125"/> + <property name="dest_y" value="61"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="2944" y="2016" width="32" height="32"> + <object id="13" name="To Desert Mountain Cave" type="warp" x="2944" y="2016" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="65"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="65"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="3584" y="2368" width="32" height="32"> + <object id="14" name="To Desert Mountain Cave" type="warp" x="3584" y="2368" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="112"/> - <property name="dest_tile_y" value="76"/> + <property name="dest_x" value="112"/> + <property name="dest_y" value="76"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="3552" y="3520" width="32" height="32"> + <object id="15" name="To Desert Mountain Cave" type="warp" x="3552" y="3520" width="32" height="32"> <properties> <property name="dest_map" value="032-3"/> - <property name="dest_tile_x" value="56"/> - <property name="dest_tile_y" value="60"/> + <property name="dest_x" value="56"/> + <property name="dest_y" value="60"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="2656" y="3744" width="32" height="32"> + <object id="16" name="To Desert Mountain Cave" type="warp" x="2656" y="3744" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="79"/> - <property name="dest_tile_y" value="121"/> + <property name="dest_x" value="79"/> + <property name="dest_y" value="121"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="1216" y="3872" width="32" height="32"> + <object id="17" name="To Desert Mountain Cave" type="warp" x="1216" y="3872" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="38"/> - <property name="dest_tile_y" value="123"/> + <property name="dest_x" value="38"/> + <property name="dest_y" value="123"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="2368" y="2880" width="32" height="32"> + <object id="18" name="To Desert Mountain Cave" type="warp" x="2368" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="74"/> - <property name="dest_tile_y" value="92"/> + <property name="dest_x" value="74"/> + <property name="dest_y" value="92"/> </properties> </object> - <object name="To Desert Mountain Cave" type="warp" x="1632" y="2880" width="32" height="32"> + <object id="19" name="To Desert Mountain Cave" type="warp" x="1632" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="006-3"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="92"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="92"/> </properties> </object> - <object name="Snake" type="spawn" x="1472" y="1632" width="256" height="128"> + <object id="20" name="Snake" type="spawn" x="1472" y="1632" width="256" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="8"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="1440" y="960" width="544" height="448"> + <object id="21" name="MountainSnake" type="spawn" x="1440" y="960" width="544" height="448"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="150000"/> + <property name="death" value="10000"/> + <property name="spawn" value="150000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2336" y="640" width="1088" height="448"> + <object id="22" name="MountainSnake" type="spawn" x="2336" y="640" width="1088" height="448"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3424" y="736" width="416" height="1216"> + <object id="23" name="MountainSnake" type="spawn" x="3424" y="736" width="416" height="1216"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3520" y="1600" width="224" height="128"> + <object id="24" name="MountainSnake" type="spawn" x="3520" y="1600" width="224" height="128"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2304" y="1408" width="960" height="192"> + <object id="25" name="MountainSnake" type="spawn" x="2304" y="1408" width="960" height="192"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3040" y="2112" width="704" height="480"> + <object id="26" name="MountainSnake" type="spawn" x="3040" y="2112" width="704" height="480"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2208" y="3072" width="288" height="448"> + <object id="27" name="MountainSnake" type="spawn" x="2208" y="3072" width="288" height="448"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3168" y="2976" width="384" height="512"> + <object id="28" name="MountainSnake" type="spawn" x="3168" y="2976" width="384" height="512"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2240" y="2048" width="832" height="544"> + <object id="29" name="MountainSnake" type="spawn" x="2240" y="2048" width="832" height="544"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2784" y="3584" width="576" height="160"> + <object id="30" name="MountainSnake" type="spawn" x="2784" y="3584" width="576" height="160"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="1536" y="3776" width="608" height="96"> + <object id="31" name="MountainSnake" type="spawn" x="1536" y="3776" width="608" height="96"> <properties> - <property name="eA_death" value="75000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="75000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="Scorpion" type="spawn" x="640" y="2592" width="896" height="1088"> + <object id="32" name="Scorpion" type="spawn" x="640" y="2592" width="896" height="1088"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="1"/> </properties> </object> - <object name="To Outback Cave" type="warp" x="960" y="3936" width="32" height="32"> + <object id="33" name="To Outback Cave" type="warp" x="960" y="3936" width="32" height="32"> <properties> <property name="dest_map" value="032-3"/> - <property name="dest_tile_x" value="128"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="128"/> + <property name="dest_y" value="33"/> </properties> </object> - <object name="To Pachua's Village" type="warp" x="1056" y="2720" width="32" height="32"> + <object id="34" name="To Pachua's Village" type="warp" x="1056" y="2720" width="32" height="32"> <properties> <property name="dest_map" value="006-2"/> - <property name="dest_tile_x" value="58"/> - <property name="dest_tile_y" value="43"/> + <property name="dest_x" value="58"/> + <property name="dest_y" value="43"/> </properties> </object> - <object name="To Pachua's Village" type="warp" x="736" y="2720" width="32" height="32"> + <object id="35" name="To Pachua's Village" type="warp" x="736" y="2720" width="32" height="32"> <properties> <property name="dest_map" value="006-2"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="43"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="43"/> </properties> </object> - <object name="To Pachua's Village" type="warp" x="736" y="3200" width="32" height="32"> + <object id="36" name="To Pachua's Village" type="warp" x="736" y="3200" width="32" height="32"> <properties> <property name="dest_map" value="006-2"/> - <property name="dest_tile_x" value="67"/> - <property name="dest_tile_y" value="64"/> + <property name="dest_x" value="67"/> + <property name="dest_y" value="64"/> </properties> </object> - <object name="To Pachua's Village" type="warp" x="672" y="3456" width="32" height="32"> + <object id="37" name="To Pachua's Village" type="warp" x="672" y="3456" width="32" height="32"> <properties> <property name="dest_map" value="006-2"/> - <property name="dest_tile_x" value="65"/> - <property name="dest_tile_y" value="72"/> + <property name="dest_x" value="65"/> + <property name="dest_y" value="72"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1184" y="832" width="32" height="32"> + <object id="38" name="To Desert Mountains" type="warp" x="1184" y="832" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="37"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="37"/> + <property name="dest_y" value="23"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1184" y="768" width="32" height="32"> + <object id="39" name="To Desert Mountains" type="warp" x="1184" y="768" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="37"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="37"/> + <property name="dest_y" value="27"/> </properties> </object> - <object name="GreenSlime" type="spawn" x="1824" y="1536" width="128" height="128"> + <object id="40" name="GreenSlime" type="spawn" x="1824" y="1536" width="128" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="3"/> </properties> </object> - <object name="Snake" type="spawn" x="1024" y="1536" width="192" height="160"> + <object id="41" name="Snake" type="spawn" x="1024" y="1536" width="192" height="160"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="50000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="8"/> </properties> </object> - <object name="Snake" type="spawn" x="2752" y="2176" width="672" height="1568"> + <object id="42" name="Snake" type="spawn" x="2752" y="2176" width="672" height="1568"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="50000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="8"/> </properties> </object> - <object name="Maggot" type="spawn" x="672" y="2656" width="928" height="960"> + <object id="43" name="Maggot" type="spawn" x="672" y="2656" width="928" height="960"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="0"/> </properties> </object> - <object name="GreenSlime" type="spawn" x="864" y="2304" width="128" height="96"> + <object id="44" name="GreenSlime" type="spawn" x="864" y="2304" width="128" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="3"/> </properties> </object> - <object name="GreenSlime" type="spawn" x="1024" y="1856" width="128" height="96"> + <object id="45" name="GreenSlime" type="spawn" x="1024" y="1856" width="128" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="3"/> </properties> </object> - <object name="Snake Cave" type="warp" x="1760" y="1472" width="32" height="32"> + <object id="46" name="Snake Cave" type="warp" x="1760" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="86"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="86"/> + <property name="dest_y" value="33"/> </properties> </object> - <object name="To Sandstorm Desert" type="warp" x="640" y="1504" width="32" height="64"> + <object id="47" name="To Sandstorm Desert" type="warp" x="640" y="1504" width="32" height="64"> <properties> <property name="dest_map" value="002-1"/> - <property name="dest_tile_x" value="118"/> - <property name="dest_tile_y" value="95"/> + <property name="dest_x" value="118"/> + <property name="dest_y" value="95"/> </properties> </object> - <object name="Snake Cave" type="warp" x="1632" y="2176" width="32" height="32"> + <object id="48" name="Snake Cave" type="warp" x="1632" y="2176" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="73"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="73"/> + <property name="dest_y" value="61"/> </properties> </object> - <object name="Snake" type="spawn" x="1088" y="2304" width="256" height="128"> + <object id="49" name="Snake" type="spawn" x="1088" y="2304" width="256" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="8"/> </properties> </object> - <object name="Snake" type="spawn" x="2592" y="768" width="1248" height="800"> + <object id="50" name="Snake" type="spawn" x="2592" y="768" width="1248" height="800"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="50000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="8"/> </properties> </object> - <object name="Snake Cave" type="warp" x="2048" y="2464" width="32" height="32"> + <object id="51" name="Snake Cave" type="warp" x="2048" y="2464" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="107"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="107"/> + <property name="dest_y" value="101"/> </properties> </object> </objectgroup> diff --git a/maps/006-2.tmx b/maps/006-2.tmx index 9d1531c0..3374859e 100644 --- a/maps/006-2.tmx +++ b/maps/006-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="110" height="110" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="110" height="110" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="5"> <properties> <property name="minimap" value="graphics/minimaps/006-2.png"/> <property name="music" value="despair.ogg"/> @@ -14,7 +14,7 @@ <tileset firstgid="931" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="979" source="../tilesets/barbarians_outdoor.tsx"/> <tileset firstgid="982" source="../tilesets/desert_city_indoors.tsx"/> - <layer name="Ground1" width="110" height="110"> + <layer id="1" name="Ground1" width="110" height="110"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -128,7 +128,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="110" height="110"> + <layer id="2" name="Ground2" width="110" height="110"> <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, @@ -242,7 +242,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 </data> </layer> - <layer name="Fringe" width="110" height="110"> + <layer id="3" name="Fringe" width="110" height="110"> <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, @@ -356,7 +356,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 </data> </layer> - <layer name="Over1" width="110" height="110"> + <layer id="4" name="Over1" width="110" height="110"> <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, @@ -470,7 +470,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 </data> </layer> - <layer name="Collision" width="110" height="110"> + <layer id="5" name="Collision" width="110" height="110"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -584,33 +584,33 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Desert Mountains" type="warp" x="2144" y="2080" width="32" height="32"> + <objectgroup id="6" name="Objects" visible="0"> + <object id="1" name="To Desert Mountains" type="warp" x="2144" y="2080" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="23"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="23"/> + <property name="dest_y" value="101"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="2080" y="2336" width="32" height="32"> + <object id="2" name="To Desert Mountains" type="warp" x="2080" y="2336" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="109"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="109"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1536" y="1408" width="32" height="32"> + <object id="3" name="To Desert Mountains" type="warp" x="1536" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="23"/> - <property name="dest_tile_y" value="86"/> + <property name="dest_x" value="23"/> + <property name="dest_y" value="86"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1856" y="1408" width="32" height="32"> + <object id="4" name="To Desert Mountains" type="warp" x="1856" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="33"/> - <property name="dest_tile_y" value="86"/> + <property name="dest_x" value="33"/> + <property name="dest_y" value="86"/> </properties> </object> </objectgroup> diff --git a/maps/006-3.tmx b/maps/006-3.tmx index 9d44e1cd..7de47d9d 100644 --- a/maps/006-3.tmx +++ b/maps/006-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="68"> <properties> <property name="minimap" value="graphics/minimaps/006-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -9,7 +9,7 @@ <tileset firstgid="3" source="../tilesets/cave2.tsx"/> <tileset firstgid="131" source="../tilesets/cave2_x2.tsx"/> <tileset firstgid="163" source="../tilesets/cave2_bilevel.tsx"/> - <layer name="Ground1" width="150" height="150"> + <layer id="1" name="Ground1" width="150" height="150"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -163,7 +163,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="150" height="150"> + <layer id="2" name="Ground2" width="150" height="150"> <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, @@ -317,7 +317,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 </data> </layer> - <layer name="Fringe" width="150" height="150"> + <layer id="3" name="Fringe" width="150" height="150"> <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, @@ -471,7 +471,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 </data> </layer> - <layer name="Over1" width="150" height="150"> + <layer id="4" name="Over1" width="150" height="150"> <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, @@ -625,7 +625,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 </data> </layer> - <layer name="Collision" width="150" height="150"> + <layer id="5" name="Collision" width="150" height="150"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -779,374 +779,374 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="928" y="3456" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2112" y="3360" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2592" y="3904" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3936" y="3584" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1856" y="2272" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3648" y="2432" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3520" y="2048" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2208" y="1184" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2848" y="1312" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3008" y="896" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1248" y="896" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1344" y="896" width="32" height="32"/> - <object name="To Desert Mountains" type="warp" x="1280" y="832" width="32" height="32"> + <objectgroup id="6" name="Objects" visible="0"> + <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="928" y="3456" width="32" height="32"/> + <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2112" y="3360" width="32" height="32"/> + <object id="3" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2592" y="3904" width="32" height="32"/> + <object id="4" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3936" y="3584" width="32" height="32"/> + <object id="5" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1856" y="2272" width="32" height="32"/> + <object id="6" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3648" y="2432" width="32" height="32"/> + <object id="7" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3520" y="2048" width="32" height="32"/> + <object id="8" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2208" y="1184" width="32" height="32"/> + <object id="9" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2848" y="1312" width="32" height="32"/> + <object id="10" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3008" y="896" width="32" height="32"/> + <object id="11" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1248" y="896" width="32" height="32"/> + <object id="12" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1344" y="896" width="32" height="32"/> + <object id="13" name="To Desert Mountains" type="warp" x="1280" y="832" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="40"/> - <property name="dest_tile_y" value="28"/> + <property name="dest_x" value="40"/> + <property name="dest_y" value="28"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1760" y="864" width="32" height="32"> + <object id="14" name="To Desert Mountains" type="warp" x="1760" y="864" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="55"/> - <property name="dest_tile_y" value="29"/> + <property name="dest_x" value="55"/> + <property name="dest_y" value="29"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1984" y="960" width="32" height="32"> + <object id="15" name="To Desert Mountains" type="warp" x="1984" y="960" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="62"/> - <property name="dest_tile_y" value="32"/> + <property name="dest_x" value="62"/> + <property name="dest_y" value="32"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="2752" y="768" width="32" height="32"> + <object id="16" name="To Desert Mountains" type="warp" x="2752" y="768" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="86"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="86"/> + <property name="dest_y" value="26"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="2912" y="768" width="32" height="32"> + <object id="17" name="To Desert Mountains" type="warp" x="2912" y="768" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="26"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="3904" y="768" width="32" height="32"> + <object id="18" name="To Desert Mountains" type="warp" x="3904" y="768" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="24"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="3648" y="1568" width="32" height="32"> + <object id="19" name="To Desert Mountains" type="warp" x="3648" y="1568" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="51"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="3328" y="1408" width="32" height="32"> + <object id="20" name="To Desert Mountains" type="warp" x="3328" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="98"/> - <property name="dest_tile_y" value="48"/> + <property name="dest_x" value="98"/> + <property name="dest_y" value="48"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="2464" y="1408" width="32" height="32"> + <object id="21" name="To Desert Mountains" type="warp" x="2464" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="77"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="77"/> + <property name="dest_y" value="46"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1920" y="2176" width="32" height="32"> + <object id="22" name="To Desert Mountains" type="warp" x="1920" y="2176" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="60"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="60"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="2944" y="2016" width="32" height="32"> + <object id="23" name="To Desert Mountains" type="warp" x="2944" y="2016" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="65"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="65"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="3584" y="2368" width="32" height="32"> + <object id="24" name="To Desert Mountains" type="warp" x="3584" y="2368" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="112"/> - <property name="dest_tile_y" value="76"/> + <property name="dest_x" value="112"/> + <property name="dest_y" value="76"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="3520" y="1792" width="32" height="32"> + <object id="25" name="To Desert Mountains" type="warp" x="3520" y="1792" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="102"/> - <property name="dest_tile_y" value="55"/> + <property name="dest_x" value="102"/> + <property name="dest_y" value="55"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="4000" y="1888" width="32" height="32"> + <object id="26" name="To Desert Mountains" type="warp" x="4000" y="1888" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="117"/> - <property name="dest_tile_y" value="59"/> + <property name="dest_x" value="117"/> + <property name="dest_y" value="59"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="2368" y="2880" width="32" height="32"> + <object id="27" name="To Desert Mountains" type="warp" x="2368" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="74"/> - <property name="dest_tile_y" value="92"/> + <property name="dest_x" value="74"/> + <property name="dest_y" value="92"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1632" y="2880" width="32" height="32"> + <object id="28" name="To Desert Mountains" type="warp" x="1632" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="92"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="92"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="1216" y="3872" width="32" height="32"> + <object id="29" name="To Desert Mountains" type="warp" x="1216" y="3872" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="38"/> - <property name="dest_tile_y" value="123"/> + <property name="dest_x" value="38"/> + <property name="dest_y" value="123"/> </properties> </object> - <object name="To Desert Mountains" type="warp" x="2528" y="3840" width="32" height="32"> + <object id="30" name="To Desert Mountains" type="warp" x="2528" y="3840" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="119"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="119"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2880" y="672" width="1184" height="288"> + <object id="31" name="MountainSnake" type="spawn" x="2880" y="672" width="1184" height="288"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2944" y="1408" width="480" height="448"> + <object id="32" name="MountainSnake" type="spawn" x="2944" y="1408" width="480" height="448"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2624" y="1856" width="480" height="384"> + <object id="33" name="MountainSnake" type="spawn" x="2624" y="1856" width="480" height="384"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2304" y="2752" width="960" height="320"> + <object id="34" name="MountainSnake" type="spawn" x="2304" y="2752" width="960" height="320"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3296" y="2368" width="416" height="320"> + <object id="35" name="MountainSnake" type="spawn" x="3296" y="2368" width="416" height="320"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3584" y="3520" width="512" height="480"> + <object id="36" name="MountainSnake" type="spawn" x="3584" y="3520" width="512" height="480"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3168" y="1792" width="480" height="576"> + <object id="37" name="MountainSnake" type="spawn" x="3168" y="1792" width="480" height="576"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="1600" y="1728" width="1024" height="1152"> + <object id="38" name="MountainSnake" type="spawn" x="1600" y="1728" width="1024" height="1152"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="1408" y="2880" width="896" height="992"> + <object id="39" name="MountainSnake" type="spawn" x="1408" y="2880" width="896" height="992"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2080" y="3776" width="544" height="192"> + <object id="40" name="MountainSnake" type="spawn" x="2080" y="3776" width="544" height="192"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3584" y="1600" width="384" height="320"> + <object id="41" name="MountainSnake" type="spawn" x="3584" y="1600" width="384" height="320"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="3776" y="1920" width="352" height="192"> + <object id="42" name="MountainSnake" type="spawn" x="3776" y="1920" width="352" height="192"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="1920" y="768" width="800" height="832"> + <object id="43" name="MountainSnake" type="spawn" x="1920" y="768" width="800" height="832"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2624" y="768" width="192" height="256"> + <object id="44" name="MountainSnake" type="spawn" x="2624" y="768" width="192" height="256"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="704" y="832" width="1184" height="928"> + <object id="45" name="MountainSnake" type="spawn" x="704" y="832" width="1184" height="928"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="672" y="1760" width="896" height="384"> + <object id="46" name="MountainSnake" type="spawn" x="672" y="1760" width="896" height="384"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="RedSlime" type="spawn" x="2368" y="2240" width="864" height="320"> + <object id="47" name="RedSlime" type="spawn" x="2368" y="2240" width="864" height="320"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="10000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="6"/> </properties> </object> - <object name="RedSlime" type="spawn" x="3712" y="2112" width="320" height="704"> + <object id="48" name="RedSlime" type="spawn" x="3712" y="2112" width="320" height="704"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="10000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="6"/> </properties> </object> - <object name="RedSlime" type="spawn" x="3008" y="2592" width="480" height="288"> + <object id="49" name="RedSlime" type="spawn" x="3008" y="2592" width="480" height="288"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="10000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="6"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="960" y="3872" width="960" height="256"> + <object id="50" name="MountainSnake" type="spawn" x="960" y="3872" width="960" height="256"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="MountainSnake" type="spawn" x="2624" y="3904" width="576" height="256"> + <object id="51" name="MountainSnake" type="spawn" x="2624" y="3904" width="576" height="256"> <properties> - <property name="eA_death" value="90000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="90000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="24"/> </properties> </object> - <object name="RedSlime" type="spawn" x="768" y="2496" width="448" height="672"> + <object id="52" name="RedSlime" type="spawn" x="768" y="2496" width="448" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="90000"/> + <property name="death" value="30000"/> + <property name="spawn" value="90000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="6"/> </properties> </object> - <object name="Spider" type="spawn" x="3744" y="2880" width="352" height="544"> + <object id="53" name="Spider" type="spawn" x="3744" y="2880" width="352" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="90000"/> + <property name="death" value="30000"/> + <property name="spawn" value="90000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="10"/> </properties> </object> - <object name="Spider" type="spawn" x="3488" y="3136" width="256" height="448"> + <object id="54" name="Spider" type="spawn" x="3488" y="3136" width="256" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="90000"/> + <property name="death" value="30000"/> + <property name="spawn" value="90000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="10"/> </properties> </object> - <object name="Spider" type="spawn" x="3168" y="3328" width="320" height="320"> + <object id="55" name="Spider" type="spawn" x="3168" y="3328" width="320" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="90000"/> + <property name="death" value="30000"/> + <property name="spawn" value="90000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="10"/> </properties> </object> - <object name="YellowSlime" type="spawn" x="2464" y="3200" width="448" height="480"> + <object id="56" name="YellowSlime" type="spawn" x="2464" y="3200" width="448" height="480"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="90000"/> + <property name="death" value="30000"/> + <property name="spawn" value="90000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="5"/> </properties> </object> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1280" y="3936" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3808" y="3584" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3936" y="2912" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3712" y="1632" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3008" y="2080" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3840" y="832" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2080" y="2336" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="896" y="1792" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1696" y="928" width="32" height="32"/> - <object name="Snake Cave" type="warp" x="4000" y="2112" width="32" height="32"> + <object id="57" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1280" y="3936" width="32" height="32"/> + <object id="58" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3808" y="3584" width="32" height="32"/> + <object id="59" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3936" y="2912" width="32" height="32"/> + <object id="60" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3712" y="1632" width="32" height="32"/> + <object id="61" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3008" y="2080" width="32" height="32"/> + <object id="62" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3840" y="832" width="32" height="32"/> + <object id="63" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2080" y="2336" width="32" height="32"/> + <object id="64" name="graphics/particles/flame.particle.xml" type="particle_effect" x="896" y="1792" width="32" height="32"/> + <object id="65" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1696" y="928" width="32" height="32"/> + <object id="66" name="Snake Cave" type="warp" x="4000" y="2112" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="85"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="85"/> + <property name="dest_y" value="52"/> </properties> </object> - <object name="Snake Cave" type="warp" x="2848" y="1472" width="32" height="32"> + <object id="67" name="Snake Cave" type="warp" x="2848" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="63"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="63"/> + <property name="dest_y" value="49"/> </properties> </object> </objectgroup> diff --git a/maps/007-1.tmx b/maps/007-1.tmx index 4d5cdc7b..82414ffb 100644 --- a/maps/007-1.tmx +++ b/maps/007-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="144" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="16"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="144" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="16"> <properties> <property name="minimap" value="graphics/minimaps/007-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -918,91 +918,91 @@ <object id="1" name="To Woodland" type="warp" x="641" y="1696" width="32" height="64"> <properties> <property name="dest_map" value="010-1"/> - <property name="dest_tile_x" value="130"/> - <property name="dest_tile_y" value="53"/> + <property name="dest_x" value="130"/> + <property name="dest_y" value="53"/> </properties> </object> <object id="2" name="To Hurnscald Outskirts" type="warp" x="2144" y="672" width="128" height="32"> <properties> <property name="dest_map" value="008-1"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="3" name="To Hurnscald" type="warp" x="3872" y="640" width="96" height="32"> <properties> <property name="dest_map" value="008-1"/> - <property name="dest_tile_x" value="132"/> - <property name="dest_tile_y" value="98"/> + <property name="dest_x" value="132"/> + <property name="dest_y" value="98"/> </properties> </object> <object id="4" name="PinkFlower" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="17"/> <property name="monster_id" value="12"/> </properties> </object> <object id="5" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="17"/> </properties> </object> <object id="6" name="Snail" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="25"/> <property name="monster_id" value="39"/> </properties> </object> <object id="7" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="270000"/> + <property name="death" value="180000"/> + <property name="spawn" value="270000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="27"/> </properties> </object> <object id="8" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="29"/> </properties> </object> <object id="9" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="33"/> </properties> </object> <object id="10" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> <object id="11" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="25"/> <property name="monster_id" value="36"/> </properties> </object> <object id="12" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> </properties> @@ -1012,8 +1012,8 @@ <object id="15" name="To Witch's Hut" type="warp" x="2336" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="007-2"/> - <property name="dest_tile_x" value="34"/> - <property name="dest_tile_y" value="34"/> + <property name="dest_x" value="34"/> + <property name="dest_y" value="34"/> </properties> </object> </objectgroup> diff --git a/maps/007-2.tmx b/maps/007-2.tmx index 29f85320..840996c8 100644 --- a/maps/007-2.tmx +++ b/maps/007-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="58" height="56" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="4"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="58" height="56" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="4"> <properties> <property name="music" value="inquisitive-inn.ogg"/> <property name="name" value="Illia forsaken inn"/> @@ -374,8 +374,8 @@ <object id="3" name="To Witch's Hut" type="warp" x="1088" y="1120" width="32" height="32"> <properties> <property name="dest_map" value="007-1"/> - <property name="dest_tile_x" value="73"/> - <property name="dest_tile_y" value="77"/> + <property name="dest_x" value="73"/> + <property name="dest_y" value="77"/> </properties> </object> </objectgroup> diff --git a/maps/008-1.tmx b/maps/008-1.tmx index a5265d7c..a782124b 100644 --- a/maps/008-1.tmx +++ b/maps/008-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="162" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="18"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="162" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="20"> <properties> <property name="minimap" value="graphics/minimaps/008-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -143,17 +143,17 @@ </layer> <layer id="2" name="Ground2" width="162" height="120"> <data encoding="csv"> -0,0,0,0,32,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,0,0,0,0,0,249,0,0,0,245,0,203,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,604,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,235,187,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -32,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,0,203,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,31,187,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,561,576,576,546,576,576,546,576,576,546,576,576,546,576,576,546,576,576,546,576,576,543,576,576,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,32,0,0,0,31,0,0,0,0,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,249,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,542,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,118,0,0,0,0,0,0,32,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,32,0,0,0,165,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,245,249,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,32,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,0,0,0,0,0,249,0,0,0,245,0,203,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,604,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,235,187,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +32,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,0,203,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,79,64,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,31,187,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,561,576,576,546,576,576,546,576,576,546,576,576,546,576,576,546,576,576,546,576,576,543,576,576,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,32,0,0,0,31,0,0,0,0,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,249,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,542,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,118,0,0,0,0,0,0,32,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,32,0,0,0,165,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,245,249,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,63,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,171,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,249,0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,203,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,245,0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,219,0,0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,20 +391,20 @@ </layer> <layer id="3" name="Fringe" width="162" height="120"> <data encoding="csv"> -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -292,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,291,292,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,291,292,0,291,292,293,294,0,293,294,0,291,292,293,294,0,291,292,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +292,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,291,292,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,293,294,0,0,0,291,292,0,291,292,293,294,0,293,294,0,291,292,293,294,0,291,292,291,292,0,291,292,0,0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,293,294,291,292,293,294,291,292,0,293,294,0,291,292,0,291,292,0,291,292,0,0,0,291,292,0,0,0,0,0,0,0,0,291,292,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,291,292,0,293,294,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,291,292,0,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,0,291,292,0,0,291,292,291,292,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,293,294,0,0,0,0,259,260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,0,291,292,0,0,291,292,291,292,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,293,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,291,292,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,293,294,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,293,294,0,0,293,294,291,292,293,294,293,294,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,296,0,0,291,292,0,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,291,292,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,293,294,293,294,0,291,292,0,291,292,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,293,294,293,294,0,291,292,0,291,292,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,293,294,291,292,0,0,0,0,293,294,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,293,294,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,293,294,0,0,0,291,292,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,291,292,0,291,292,0,0,0,0,0,293,294,0,0,0,0,0,0,291,292,293,294,0,293,294,291,292,0,0,0,0,0,0,582,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,584,0,0,0,0,0,293,294,0,0,0,0,0,293,294,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -765,124 +765,131 @@ <object id="1" name="To Hurnscald West Entrance" type="warp" x="1728" y="1920" width="32" height="96"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="36"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="36"/> </properties> </object> <object id="2" name="To Hurnscald South Entrance" type="warp" x="2464" y="2560" width="128" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="54"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="54"/> </properties> </object> <object id="3" name="To Hurnscald East Entrance" type="warp" x="4064" y="1920" width="32" height="64"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="96"/> - <property name="dest_tile_y" value="36"/> + <property name="dest_x" value="96"/> + <property name="dest_y" value="36"/> </properties> </object> <object id="4" name="To Hurnscald North Entrance" type="warp" x="2464" y="1568" width="128" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="5" name="To Woodland" type="warp" x="768" y="1920" width="32" height="128"> <properties> <property name="dest_map" value="011-1"/> - <property name="dest_tile_x" value="123"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="123"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="6" name="To Woodland Mining Camp" type="warp" x="2464" y="544" width="128" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="97"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="97"/> </properties> </object> <object id="7" name="To Woodland" type="warp" x="2464" y="3264" width="128" height="32"> <properties> <property name="dest_map" value="007-1"/> - <property name="dest_tile_x" value="68"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="68"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="8" name="To Woodland" type="warp" x="4192" y="3232" width="96" height="32"> <properties> <property name="dest_map" value="007-1"/> - <property name="dest_tile_x" value="122"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="122"/> + <property name="dest_y" value="23"/> </properties> </object> <object id="9" name="PinkFlower" type="spawn" x="0" y="0"> <properties> - <property name="eA_spawn" value="20"/> <property name="max_beings" value="10"/> <property name="monster_id" value="12"/> + <property name="spawn" value="20"/> </properties> </object> <object id="10" name="Pinkie" type="spawn" x="0" y="0"> <properties> - <property name="eA_spawn" value="20"/> <property name="max_beings" value="18"/> <property name="monster_id" value="16"/> + <property name="spawn" value="20"/> </properties> </object> <object id="11" name="ManaBug" type="spawn" x="0" y="0"> <properties> - <property name="eA_spawn" value="30"/> <property name="max_beings" value="18"/> <property name="monster_id" value="1131"/> + <property name="spawn" value="30"/> </properties> </object> <object id="12" name="Maggot" type="spawn" x="0" y="0"> <properties> - <property name="eA_spawn" value="30"/> <property name="max_beings" value="30"/> <property name="monster_id" value="1002"/> + <property name="spawn" value="30"/> </properties> </object> <object id="13" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="270000"/> + <property name="death" value="180000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="27"/> + <property name="spawn" value="270000"/> </properties> </object> <object id="14" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="33"/> + <property name="spawn" value="60000"/> </properties> </object> <object id="15" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> <object id="16" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> <property name="max_beings" value="10"/> <property name="monster_id" value="36"/> + <property name="spawn" value="30"/> </properties> </object> <object id="17" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> + <property name="spawn" value="30"/> + </properties> + </object> + <object id="19" name="PinkFlower" type="spawn" x="3808" y="896" width="352" height="416"> + <properties> + <property name="death" value="250"/> + <property name="max_beings" value="2"/> + <property name="monster_id" value="12"/> </properties> </object> </objectgroup> diff --git a/maps/009-1.tmx b/maps/009-1.tmx index 2cb56aff..0905a593 100644 --- a/maps/009-1.tmx +++ b/maps/009-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="117" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="95"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="117" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="95"> <properties> <property name="minimap" value="graphics/minimaps/009-1.png"/> <property name="music" value="magick-real.ogg"/> @@ -137,19 +137,19 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,48,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,16,16,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,17,18,18,17,17,18,18,18,561,576,576,0,0,0,0,541,0,0,576,545,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,17,17,18,18,17,18,17,17,559,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,407,408,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,14,14,14,14,14,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,17,0,0,0,0,0,0,17,18,559,0,502,0,0,0,490,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,391,409,0,0,0,0,0,0,406,421,422,0,424,425,408,0,0,0,0,0,0,0,541,490,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,31,31,32,32,0,18,18,559,0,518,0,0,0,0,0,0,0,516,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,391,409,0,0,0,0,0,421,422,0,0,0,0,0,424,425,0,0,0,0,0,0,557,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,28,28,28,28,28,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,31,32,31,31,0,18,17,559,0,518,0,0,490,0,0,0,0,516,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,436,360,361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,573,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,17,17,18,18,17,18,17,17,559,0,0,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,14,14,14,14,14,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,17,0,0,0,0,0,0,17,18,559,0,502,0,0,0,490,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,421,422,0,424,425,408,0,0,0,0,0,0,0,541,490,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,31,31,32,32,0,18,18,559,0,518,0,0,0,0,0,0,0,516,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,421,422,0,0,0,0,0,424,425,0,0,0,0,0,0,557,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,28,28,28,28,28,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,31,32,31,31,0,18,17,559,0,518,0,0,490,0,0,0,0,516,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,573,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,17,18,0,32,32,0,18,17,18,559,0,534,0,0,0,0,0,0,0,532,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,452,452,377,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,18,18,0,31,31,0,18,17,0,559,0,0,0,0,0,0,650,617,0,0,0,95,96,96,97,0,0,0,0,0,469,469,469,469,469,469,469,469,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,18,18,0,31,31,0,18,17,0,559,0,0,0,0,0,0,650,617,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,469,469,469,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,18,17,0,32,32,0,17,17,0,559,0,0,0,0,0,0,53,4,4,4,4,50,96,96,97,0,0,0,0,0,0,0,0,0,0,0,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,0,0,516,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,18,18,0,31,32,0,18,18,18,559,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,557,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,532,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,17,0,32,31,31,32,0,17,18,559,574,574,0,0,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,636,0,0,0,0,0,573,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,17,0,31,32,31,32,0,17,18,559,574,574,574,574,0,0,0,0,0,0,559,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,0,0,0,0,0,0,18,17,560,576,576,576,576,576,576,576,576,576,576,577,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,17,18,18,17,18,18,17,17,17,18,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,14,14,14,14,14,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,18,17,17,17,18,18,18,18,17,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,355,341,390,391,392,345,363,372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,18,18,17,17,17,18,18,18,18,17,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,404,405,406,407,408,392,410,0,0,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,31,32,0,28,28,28,28,28,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,421,422,0,424,425,426,0,0,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,31,32,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,32,31,0,0,0,0,0,0,0,0,0,0, @@ -374,18 +374,18 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,374,375,376,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,374,389,405,391,392,393,376,0,0,0,0,0,0,0,0,0,0,388,389,390,391,392,393,394,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,374,389,405,391,409,393,376,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,374,375,376,0,0,0,0,374,389,405,405,405,391,392,392,392,393,376,0,0,0,0,435,437,437,437,404,324,325,344,392,392,410,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,387,405,405,405,391,409,409,409,395,0,0,0,0,0,0,0,0,0,0,0,0,0,388,389,390,391,392,393,394,0,387,405,405,405,405,405,391,392,392,392,392,392,395,0,0,0,451,452,453,453,453,340,356,391,392,392,473,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,403,405,405,488,488,488,409,409,411,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,391,409,409,410,0,403,405,0,0,0,0,0,0,0,0,0,409,0,0,0,0,502,468,468,468,355,356,390,391,392,392,508,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,403,488,488,488,488,488,488,488,473,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,0,0,409,473,0,403,405,0,0,0,0,0,0,0,0,0,409,473,0,0,0,518,0,0,0,404,390,390,391,392,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,487,504,504,504,504,504,504,504,507,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,0,0,409,489,0,403,406,0,0,0,0,0,0,0,0,0,408,489,0,0,0,534,0,0,0,404,390,390,391,541,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,435,437,437,437,437,404,390,0,0,0,409,489,0,503,504,0,0,0,0,0,0,0,0,0,504,489,0,0,0,0,0,0,0,404,390,390,391,392,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,403,405,405,488,488,488,409,409,411,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,391,409,409,410,0,403,405,390,390,390,406,407,408,392,392,392,409,0,0,0,0,502,468,468,468,355,356,390,391,392,392,508,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,403,488,488,488,488,488,488,488,473,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,391,409,409,473,0,403,405,0,0,0,0,0,0,0,0,0,409,473,0,0,0,518,0,0,0,404,390,390,391,392,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,487,504,504,504,504,504,504,504,507,0,0,0,0,0,0,0,0,0,0,0,0,0,403,390,390,391,409,409,489,0,403,406,0,0,0,0,0,0,0,0,0,408,489,0,0,0,534,0,0,0,404,390,390,391,541,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,435,437,437,437,437,404,390,436,360,361,409,489,0,503,504,0,0,0,0,0,0,0,0,0,504,489,0,0,0,0,0,0,0,404,390,390,391,392,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,451,453,453,453,453,453,452,0,0,0,361,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,404,390,406,407,408,392,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,467,468,0,0,0,0,0,0,0,0,378,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,421,422,0,424,504,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,467,468,469,469,469,469,469,0,0,0,378,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,421,422,0,424,504,524,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,435,437,437,437,437,437,437,437,438,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,435,437,437,437,437,437,437,438,451,453,453,453,453,453,453,453,473,0,0,435,437,437,437,437,327,328,437,437,437,437,438,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,451,453,0,0,0,0,453,473,451,453,453,453,453,453,453,453,489,0,0,451,453,453,340,341,391,345,346,453,453,453,473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,451,453,452,452,452,452,453,473,451,453,453,453,453,453,453,453,489,0,0,451,453,453,340,341,391,345,346,453,453,453,473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,487,521,0,0,0,0,521,524,451,453,0,0,0,0,0,453,489,0,0,487,522,0,0,0,0,0,0,0,0,521,489,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,487,0,0,0,0,0,0,0,467,469,0,0,0,0,0,469,470,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -465,7 +465,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,454,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,454,0,0,0,0,0,0,0,0,454,0,0,0,0,0,0,0,0,0,0,0,0,0,454,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,467,469,0,0,0,0,469,470,0,0,0,0,0,0,0,0,454,0,0,467,468,0,0,0,0,0,0,0,0,469,470,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,467,469,0,0,0,0,469,470,0,0,0,0,0,0,0,0,454,0,0,467,468,355,341,390,391,392,345,363,372,469,470,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -653,113 +653,113 @@ <object id="1" name="To Hurnscald South Exit" type="warp" x="1504" y="1760" width="128" height="32"> <properties> <property name="dest_map" value="008-1"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="81"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="81"/> </properties> </object> <object id="2" name="To Hurnscald East Exit" type="warp" x="3104" y="1120" width="32" height="64"> <properties> <property name="dest_map" value="008-1"/> - <property name="dest_tile_x" value="128"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="128"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="3" name="To Hurnscald Inn" type="warp" x="1120" y="960" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="50"/> - <property name="dest_tile_y" value="54"/> + <property name="dest_x" value="50"/> + <property name="dest_y" value="54"/> </properties> </object> <object id="4" name="To Storage Room" type="warp" x="1856" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="27"/> - <property name="dest_tile_y" value="106"/> + <property name="dest_x" value="27"/> + <property name="dest_y" value="106"/> </properties> </object> <object id="5" name="To Archer Shop" type="warp" x="1888" y="1056" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="95"/> - <property name="dest_tile_y" value="29"/> + <property name="dest_x" value="95"/> + <property name="dest_y" value="29"/> </properties> </object> <object id="6" name="To Hurnscald Potion Shop" type="warp" x="2272" y="960" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="130"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="130"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="7" name="To Hurnscald Hospital" type="warp" x="2560" y="992" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="149"/> - <property name="dest_tile_y" value="66"/> + <property name="dest_x" value="149"/> + <property name="dest_y" value="66"/> </properties> </object> <object id="8" name="To Hurnscald House" type="warp" x="2304" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="77"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="77"/> </properties> </object> <object id="9" name="To Hurnscald Forge" type="warp" x="2880" y="1472" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="182"/> - <property name="dest_tile_y" value="66"/> + <property name="dest_x" value="182"/> + <property name="dest_y" value="66"/> </properties> </object> <object id="10" name="To Hurnscald West Exit" type="warp" x="768" y="1120" width="32" height="96"> <properties> <property name="dest_map" value="008-1"/> - <property name="dest_tile_x" value="53"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="53"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="11" name="To Hurnscald North Exit" type="warp" x="1504" y="768" width="128" height="32"> <properties> <property name="dest_map" value="008-1"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="48"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="48"/> </properties> </object> <object id="12" name="CloverPatch" type="spawn" x="2336" y="1024" width="96" height="64"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="120000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> </properties> </object> <object id="13" name="PinkFlower" type="spawn" x="800" y="1216" width="320" height="448"> <properties> - <property name="eA_death" value="250"/> + <property name="death" value="250"/> <property name="max_beings" value="2"/> <property name="monster_id" value="12"/> </properties> </object> <object id="14" name="Squirrel" type="spawn" x="2592" y="1568" width="512" height="160"> <properties> - <property name="eA_death" value="5000"/> + <property name="death" value="5000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="36"/> </properties> </object> <object id="15" name="Squirrel" type="spawn" x="2496" y="1152" width="192" height="192"> <properties> - <property name="eA_death" value="5000"/> + <property name="death" value="5000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="36"/> </properties> </object> <object id="16" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="5"/> <property name="monster_id" value="53"/> </properties> @@ -767,8 +767,8 @@ <object id="17" name="To Bedroom" type="warp" x="1920" y="1312" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="32"/> - <property name="dest_tile_y" value="91"/> + <property name="dest_x" value="32"/> + <property name="dest_y" value="91"/> </properties> </object> </objectgroup> diff --git a/maps/009-2.tmx b/maps/009-2.tmx index 629daecb..d2f60c6d 100644 --- a/maps/009-2.tmx +++ b/maps/009-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="25"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="25"> <properties> <property name="music" value="magick-real.ogg"/> <property name="name" value="Hurnscald Indoor"/> @@ -100,22 +100,22 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,51,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,36,86,87,88,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,102,103,104,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,3,5,3,3,3,3,5,3,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,21,19,19,19,19,21,19,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,21,19,19,19,19,21,19,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,35,35,35,35,35,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,37,36,36,36,36,37,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,38,39,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,54,55,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,3,3,3,4,3,3,3,4,3,3,3,4,3,3,3,0,36,0,3,3,3,3,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,19,19,20,19,19,19,20,19,19,19,20,19,19,19,0,36,0,19,19,19,19,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,0,36,0,35,35,35,35,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,3,3,3,4,3,3,3,4,3,3,3,4,3,3,3,36,36,36,3,3,3,3,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,19,19,20,19,19,19,20,19,19,19,20,19,19,19,36,36,36,19,19,19,19,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,36,36,36,35,35,35,35,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,37,36,36,36,37,70,71,72,37,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,36,36,36,36,36,0,0,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,36,36,36,36,36,0,0,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,3,0,0,0,0,0,0,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,19,0,0,0,0,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, -51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,35,0,0,0,0,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, +51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,88,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,102,103,104,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -237,8 +237,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,231,231,231,231,232,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,247,247,247,247,248,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,259,260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,150,165,0,0,163,165,0,0,0,0,0,0,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,259,260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,150,165,0,0,163,165,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,168,0,0,166,168,0,0,0,0,0,0,216,0,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,215,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,0,193,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -362,7 +362,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -505,7 +505,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 </data> </layer> - <layer id="5" name="Over1" width="200" height="120"> + <layer id="5" name="Over1" width="200" height="120" visible="0"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -759,155 +759,155 @@ <object id="3" name="To First Floor" type="warp" x="2368" y="736" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="74"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="74"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="4" name="To Outside" type="warp" x="3040" y="960" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="34"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="34"/> </properties> </object> <object id="5" name="To Outside" type="warp" x="4160" y="832" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="71"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="71"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="6" name="To Second Floor" type="warp" x="4576" y="832" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="144"/> - <property name="dest_tile_y" value="43"/> + <property name="dest_x" value="144"/> + <property name="dest_y" value="43"/> </properties> </object> <object id="7" name="To Third Floor" type="warp" x="4576" y="1344" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="144"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="144"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="8" name="To First Floor" type="warp" x="4928" y="1536" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="155"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="155"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="9" name="To First Floor" type="warp" x="3616" y="1472" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="70"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="70"/> </properties> </object> <object id="10" name="To Outside" type="warp" x="1600" y="1760" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="11" name="To Cellar" type="warp" x="2368" y="1696" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="143"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="143"/> + <property name="dest_y" value="78"/> </properties> </object> <object id="12" name="To Second Floor" type="warp" x="2336" y="1472" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="75"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="75"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="13" name="To Outside" type="warp" x="3648" y="2496" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="72"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="72"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="14" name="To Second Floor" type="warp" x="3616" y="2208" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="15" name="To Outside" type="warp" x="4768" y="2144" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="80"/> - <property name="dest_tile_y" value="32"/> + <property name="dest_x" value="80"/> + <property name="dest_y" value="32"/> </properties> </object> <object id="16" name="To First Floor" type="warp" x="4576" y="2464" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="74"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="74"/> + <property name="dest_y" value="52"/> </properties> </object> <object id="17" name="To Second Floor" type="warp" x="4928" y="1984" width="64" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="155"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="155"/> + <property name="dest_y" value="46"/> </properties> </object> <object id="18" name="To Outside" type="warp" x="5792" y="2144" width="64" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="19" name="To Hurnscald Cave" type="warp" x="4704" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="009-3"/> - <property name="dest_tile_x" value="173"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="173"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="20" name="To Outside" type="warp" x="864" y="3424" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="58"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="58"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="21" name="To Inn Private Room" type="warp" x="1472" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="76"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="76"/> + <property name="dest_y" value="78"/> </properties> </object> <object id="22" name="To Hurnscald Inn" type="warp" x="2464" y="2496" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="47"/> - <property name="dest_tile_y" value="50"/> + <property name="dest_x" value="47"/> + <property name="dest_y" value="50"/> </properties> </object> <object id="23" name="To Outside" type="warp" x="992" y="2912" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="41"/> </properties> </object> <object id="24" name="To Vault" type="warp" x="1216" y="3360" width="32" height="32"> <properties> <property name="dest_map" value="009-7"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="20"/> </properties> </object> </objectgroup> diff --git a/maps/009-3.tmx b/maps/009-3.tmx index 74d51452..27013b46 100644 --- a/maps/009-3.tmx +++ b/maps/009-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="200" height="151" tilewidth="32" tileheight="32" nextobjectid="33"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="151" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="33"> <properties> <property name="minimap" value="graphics/minimaps/009-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -13,8 +13,8 @@ <tileset firstgid="659" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="915" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="963" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="995" source="../tilesets/arena.tsx"/> - <layer name="Ground1" width="200" height="151"> + <tileset firstgid="1011" source="../tilesets/arena.tsx"/> + <layer id="1" name="Ground1" width="200" height="151"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,23,23,7,23,23,23,7,23,23,23,7,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -169,7 +169,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,113,113,113,113,113,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="200" height="151"> + <layer id="2" name="Fringe" width="200" height="151"> <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, @@ -207,19 +207,19 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1142,1143,0,0,0,1144,1145,0,1011,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1158,1159,0,0,0,1160,1161,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1021,0,1180,1182,1181,1181,1182,1186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1212,1194,1210,1194,996,1202,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1228,1245,1233,1229,1230,1234,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1037,0,1196,1198,1197,1197,1198,1202,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1228,1210,1226,1210,1012,1218,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1244,1261,1249,1245,1246,1250,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,132,133,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1069,1070,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,1082,1083,0,0,0,1069,1070,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,132,133,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1085,1086,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,1098,1099,0,0,0,1085,1086,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,1069,1070,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,1085,1086,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -242,7 +242,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,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1020,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1036,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,324,276,276,228,276,276,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,340,0,0,0,0,0,339,276,276,228,276,228,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -324,7 +324,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,181,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="200" height="151"> + <layer id="3" name="Over1" width="200" height="151"> <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,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,23,0,0,0,23,0,0,0,23,0,0,23,23,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -360,20 +360,20 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,26,27,0,0,0,25,26,26,26,26,26,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1110,1111,0,0,0,1112,1113,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,27,0,0,0,0,0,0,0,0,0,0,1007,0,1126,1127,0,0,0,1128,1129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1023,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,12,0,0,0,0,0,0,0,0,0,0,11,27,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,27,0,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1023,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1126,1127,0,0,0,1128,1129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,27,0,0,0,0,0,0,0,0,0,0,1023,0,1142,1143,0,0,0,1144,1145,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1039,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,12,0,0,0,0,0,0,0,0,0,0,11,27,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,27,0,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1039,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,12,0,0,0,0,11,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,27,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,11,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,12,0,0,0,0,11,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,39,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1037,1038,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1037,1038,0,1039,1040,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1066,1067,0,0,0,1053,1054,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,12,0,0,0,0,11,26,26,26,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,39,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1053,1054,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1053,1054,0,1055,1056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1082,1083,0,0,0,1069,1070,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1037,1038,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,27,0,0,0,0,0,0,1053,1054,0,0,0,25,26,26,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1053,1054,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,27,0,0,0,0,0,0,1069,1070,0,0,0,25,26,26,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26,26,26,26,26,26,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,27,0,0,0,0,0,11,27,0,0,0,0,0,0,0,25,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,26,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,0,0,11,27,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0,0,11,26,27,0,0,25,26,26,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,26, @@ -479,7 +479,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 </data> </layer> - <layer name="Collision" width="200" height="151"> + <layer id="4" name="Collision" width="200" height="151"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -634,7 +634,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="5" name="Objects"> <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5376" y="1344" width="32" height="32"/> <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5728" y="1472" width="32" height="32"/> <object id="3" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4928" y="3808" width="32" height="32"/> @@ -662,59 +662,59 @@ <object id="25" name="To Cellar" type="warp" x="5536" y="640" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="147"/> - <property name="dest_tile_y" value="89"/> + <property name="dest_x" value="147"/> + <property name="dest_y" value="89"/> </properties> </object> <object id="26" name="To Lake Cave" type="warp" x="640" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="129"/> - <property name="dest_tile_y" value="87"/> + <property name="dest_x" value="129"/> + <property name="dest_y" value="87"/> </properties> </object> <object id="27" name="To Northern Mines" type="warp" x="5024" y="960" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="179"/> - <property name="dest_tile_y" value="180"/> + <property name="dest_x" value="179"/> + <property name="dest_y" value="180"/> </properties> </object> <object id="28" name="To Woodland Hills Cave" type="warp" x="3744" y="608" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="160"/> - <property name="dest_tile_y" value="102"/> + <property name="dest_x" value="160"/> + <property name="dest_y" value="102"/> </properties> </object> <object id="29" name="YellowSlime" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="20"/> <property name="monster_id" value="5"/> </properties> </object> <object id="30" name="BlackScorpion" type="spawn" x="0" y="0" width="4032" height="4832"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="25"/> <property name="monster_id" value="7"/> </properties> </object> <object id="31" name="RedSlime" type="spawn" x="0" y="0" width="4064" height="4832"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="35"/> <property name="monster_id" value="6"/> </properties> </object> <object id="32" name="CaveMaggot" type="spawn" x="2880" y="0" width="3552" height="4864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="54"/> </properties> diff --git a/maps/009-4.tmx b/maps/009-4.tmx index f268fd27..7e1698b3 100644 --- a/maps/009-4.tmx +++ b/maps/009-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="160" height="160" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="160" height="160" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="50"> <properties> <property name="name" value="Orum Caves"/> </properties> @@ -10,8 +10,8 @@ <tileset firstgid="403" source="../tilesets/woodland_ground.tsx"/> <tileset firstgid="659" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="915" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="931" source="../tilesets/woodland_x2.tsx"/> - <layer name="Ground1" width="160" height="160"> + <tileset firstgid="963" source="../tilesets/woodland_x2.tsx"/> + <layer id="1" name="Ground1" width="160" height="160"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -175,7 +175,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="160" height="160"> + <layer id="2" name="Ground2" width="160" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -339,7 +339,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 </data> </layer> - <layer name="Fringe" width="160" height="160"> + <layer id="3" name="Fringe" width="160" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,13 +372,13 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,974,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,974,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,974,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,974,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -426,13 +426,13 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,974,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,974,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,974,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,974,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -503,7 +503,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 </data> </layer> - <layer name="Over1" width="160" height="160"> + <layer id="4" name="Over1" width="160" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -667,7 +667,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 </data> </layer> - <layer name="Collision" width="160" height="160"> + <layer id="5" name="Collision" width="160" height="160"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -831,137 +831,137 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1856" y="992" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1920" y="1792" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1984" y="1792" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="736" y="2112" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="800" y="2112" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1504" y="1216" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1568" y="1216" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2176" y="704" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2144" y="1376" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1056" y="2784" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3328" y="2496" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3264" y="2496" width="32" height="32"/> - <object name="graphics/particles/sphere-white.particle.xml" type="particle_effect" x="1706" y="5156" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3264" y="768" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3328" y="768" width="32" height="32"/> - <object name="graphics/particles/sphere-white.particle.xml" type="particle_effect" x="3760" y="1313" width="32" height="32"/> - <object name="graphics/particles/waterfall.particle.xml" type="particle_effect" x="3936" y="1056" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3552" y="1344" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3648" y="1472" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="4032" y="1472" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3776" y="1248" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3680" y="1248" width="32" height="32"/> - <object name="graphics/particles/waterfall.particle.xml" type="particle_effect" x="3936" y="2784" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3680" y="2976" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3648" y="3200" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="4032" y="3200" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1120" y="3648" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1248" y="3648" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1152" y="3840" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1216" y="3840" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2240" y="4064" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2368" y="4064" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2272" y="4256" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2336" y="4256" width="32" height="32"/> - <object name="To Hurnscald Cave" type="warp" x="1184" y="3584" width="32" height="32"> + <objectgroup id="6" name="Objects" visible="0"> + <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1856" y="992" width="32" height="32"/> + <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1920" y="1792" width="32" height="32"/> + <object id="3" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1984" y="1792" width="32" height="32"/> + <object id="4" name="graphics/particles/flame.particle.xml" type="particle_effect" x="736" y="2112" width="32" height="32"/> + <object id="5" name="graphics/particles/flame.particle.xml" type="particle_effect" x="800" y="2112" width="32" height="32"/> + <object id="6" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1504" y="1216" width="32" height="32"/> + <object id="7" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1568" y="1216" width="32" height="32"/> + <object id="8" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2176" y="704" width="32" height="32"/> + <object id="9" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2144" y="1376" width="32" height="32"/> + <object id="10" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1056" y="2784" width="32" height="32"/> + <object id="11" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3328" y="2496" width="32" height="32"/> + <object id="12" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3264" y="2496" width="32" height="32"/> + <object id="13" name="graphics/particles/sphere-white.particle.xml" type="particle_effect" x="1706" y="5156" width="32" height="32"/> + <object id="14" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3264" y="768" width="32" height="32"/> + <object id="15" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3328" y="768" width="32" height="32"/> + <object id="16" name="graphics/particles/sphere-white.particle.xml" type="particle_effect" x="3760" y="1313" width="32" height="32"/> + <object id="17" name="graphics/particles/waterfall.particle.xml" type="particle_effect" x="3936" y="1056" width="32" height="32"/> + <object id="18" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3552" y="1344" width="32" height="32"/> + <object id="19" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3648" y="1472" width="32" height="32"/> + <object id="20" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4032" y="1472" width="32" height="32"/> + <object id="21" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3776" y="1248" width="32" height="32"/> + <object id="22" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3680" y="1248" width="32" height="32"/> + <object id="23" name="graphics/particles/waterfall.particle.xml" type="particle_effect" x="3936" y="2784" width="32" height="32"/> + <object id="24" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3680" y="2976" width="32" height="32"/> + <object id="25" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3648" y="3200" width="32" height="32"/> + <object id="26" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4032" y="3200" width="32" height="32"/> + <object id="27" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1120" y="3648" width="32" height="32"/> + <object id="28" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1248" y="3648" width="32" height="32"/> + <object id="29" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1152" y="3840" width="32" height="32"/> + <object id="30" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1216" y="3840" width="32" height="32"/> + <object id="31" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2240" y="4064" width="32" height="32"/> + <object id="32" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2368" y="4064" width="32" height="32"/> + <object id="33" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2272" y="4256" width="32" height="32"/> + <object id="34" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2336" y="4256" width="32" height="32"/> + <object id="35" name="To Hurnscald Cave" type="warp" x="1184" y="3584" width="32" height="32"> <properties> <property name="dest_map" value="009-3"/> - <property name="dest_tile_x" value="163"/> - <property name="dest_tile_y" value="114"/> + <property name="dest_x" value="163"/> + <property name="dest_y" value="114"/> </properties> </object> - <object name="To Torches Cave" type="warp" x="2304" y="4352" width="32" height="32"> + <object id="36" name="To Torches Cave" type="warp" x="2304" y="4352" width="32" height="32"> <properties> <property name="dest_map" value="009-4"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="27"/> </properties> </object> - <object name="To Torches Cave" type="warp" x="1184" y="3936" width="32" height="32"> + <object id="37" name="To Torches Cave" type="warp" x="1184" y="3936" width="32" height="32"> <properties> <property name="dest_map" value="009-4"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="27"/> </properties> </object> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3552" y="3072" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3776" y="2976" width="32" height="32"/> - <object name="To Hurnscald Cave" type="warp" x="2304" y="4000" width="32" height="32"> + <object id="38" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3552" y="3072" width="32" height="32"/> + <object id="39" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3776" y="2976" width="32" height="32"/> + <object id="40" name="To Hurnscald Cave" type="warp" x="2304" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="009-3"/> - <property name="dest_tile_x" value="163"/> - <property name="dest_tile_y" value="114"/> + <property name="dest_x" value="163"/> + <property name="dest_y" value="114"/> </properties> </object> - <object name="To Torches Cave" type="warp" x="3296" y="704" width="32" height="32"> + <object id="41" name="To Torches Cave" type="warp" x="3296" y="704" width="32" height="32"> <properties> <property name="dest_map" value="009-4"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="46"/> </properties> </object> - <object name="To Torches Cave" type="warp" x="3296" y="2432" width="32" height="32"> + <object id="42" name="To Torches Cave" type="warp" x="3296" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="009-4"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="46"/> </properties> </object> - <object name="Silkworm" type="spawn" x="3360" y="2880" width="800" height="512"> + <object id="43" name="Silkworm" type="spawn" x="3360" y="2880" width="800" height="512"> <properties> - <property name="eA_death" value="14000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="14000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="33"/> </properties> </object> - <object name="CaveSnake" type="spawn" x="3296" y="2912" width="800" height="512"> + <object id="44" name="CaveSnake" type="spawn" x="3296" y="2912" width="800" height="512"> <properties> - <property name="eA_death" value="14000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="14000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="19"/> </properties> </object> - <object name="CaveSnake" type="spawn" x="2912" y="672" width="800" height="512"> + <object id="45" name="CaveSnake" type="spawn" x="2912" y="672" width="800" height="512"> <properties> - <property name="eA_death" value="14000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="14000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="19"/> </properties> </object> - <object name="Silkworm" type="spawn" x="3008" y="640" width="800" height="512"> + <object id="46" name="Silkworm" type="spawn" x="3008" y="640" width="800" height="512"> <properties> - <property name="eA_death" value="14000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="14000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="33"/> </properties> </object> - <object name="Silkworm" type="spawn" x="3616" y="1280" width="416" height="352"> + <object id="47" name="Silkworm" type="spawn" x="3616" y="1280" width="416" height="352"> <properties> - <property name="eA_death" value="14000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="14000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="33"/> </properties> </object> - <object name="Maggot" type="spawn" x="1920" y="3936" width="800" height="512"> + <object id="48" name="Maggot" type="spawn" x="1920" y="3936" width="800" height="512"> <properties> - <property name="eA_death" value="14000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="14000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="0"/> </properties> </object> - <object name="Maggot" type="spawn" x="832" y="3488" width="800" height="512"> + <object id="49" name="Maggot" type="spawn" x="832" y="3488" width="800" height="512"> <properties> - <property name="eA_death" value="14000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="14000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="0"/> </properties> diff --git a/maps/009-5.tmx b/maps/009-5.tmx index 400893c5..68fdad6e 100644 --- a/maps/009-5.tmx +++ b/maps/009-5.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="100" height="100" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="13"> <properties> <property name="music" value="cavesong.ogg"/> <property name="name" value="Last man standing"/> @@ -7,7 +7,7 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/cave.tsx"/> <tileset firstgid="131" source="../tilesets/arena.tsx"/> - <layer name="Ground1" width="100" height="100"> + <layer id="1" name="Ground1" width="100" height="100"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -111,7 +111,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="100" height="100"> + <layer id="2" name="Fringe" width="100" height="100"> <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, @@ -215,7 +215,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 </data> </layer> - <layer name="Over1" width="100" height="100"> + <layer id="3" name="Over1" width="100" height="100"> <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, @@ -319,7 +319,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 </data> </layer> - <layer name="Collision" width="100" height="100"> + <layer id="4" name="Collision" width="100" height="100"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -423,23 +423,23 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2177" y="1378" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2177" y="1378" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2240" y="1760" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1664" y="2176" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1728" y="2240" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1664" y="2304" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1504" y="1824" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1056" y="2272" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="864" y="1696" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1152" y="1344" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1568" y="1376" width="32" height="32"/> - <object name="to Hurnscald" type="warp" x="1664" y="2368" width="96" height="32"> + <objectgroup id="5" name="Objects" visible="0"> + <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2177" y="1378" width="32" height="32"/> + <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2177" y="1378" width="32" height="32"/> + <object id="3" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2240" y="1760" width="32" height="32"/> + <object id="4" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1664" y="2176" width="32" height="32"/> + <object id="5" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1728" y="2240" width="32" height="32"/> + <object id="6" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1664" y="2304" width="32" height="32"/> + <object id="7" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1504" y="1824" width="32" height="32"/> + <object id="8" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1056" y="2272" width="32" height="32"/> + <object id="9" name="graphics/particles/flame.particle.xml" type="particle_effect" x="864" y="1696" width="32" height="32"/> + <object id="10" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1152" y="1344" width="32" height="32"/> + <object id="11" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1568" y="1376" width="32" height="32"/> + <object id="12" name="to Hurnscald" type="warp" x="1664" y="2368" width="96" height="32"> <properties> <property name="dest_map" value="009-3"/> - <property name="dest_tile_x" value="162"/> - <property name="dest_tile_y" value="81"/> + <property name="dest_x" value="162"/> + <property name="dest_y" value="81"/> </properties> </object> </objectgroup> diff --git a/maps/009-6.tmx b/maps/009-6.tmx index cf04b312..7c8fc8ff 100644 --- a/maps/009-6.tmx +++ b/maps/009-6.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" nextobjectid="2"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="2"> <properties> <property name="music" value="cavesong.ogg"/> <property name="name" value="Cave"/> @@ -9,8 +9,8 @@ <tileset firstgid="131" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="387" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="435" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="467" source="../tilesets/barbarians_outdoor.tsx"/> - <layer name="Ground1" width="70" height="70"> + <tileset firstgid="483" source="../tilesets/barbarians_outdoor.tsx"/> + <layer id="1" name="Ground1" width="70" height="70"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -84,7 +84,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="70" height="70"> + <layer id="2" name="Ground2" 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, @@ -115,7 +115,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,467,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,323,278,279,280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -158,7 +158,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 name="Fringe" width="70" height="70"> + <layer id="3" 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, @@ -232,7 +232,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 name="Over1" width="70" height="70"> + <layer id="4" name="Over1" 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, @@ -306,7 +306,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 name="Collision" width="70" height="70"> + <layer id="5" name="Collision" width="70" height="70"> <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, @@ -380,12 +380,12 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="6" name="Objects" visible="0"> <object id="1" name="To Hurnscald Cave" type="warp" x="1152" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="009-3"/> - <property name="dest_tile_x" value="162"/> - <property name="dest_tile_y" value="82"/> + <property name="dest_x" value="162"/> + <property name="dest_y" value="82"/> </properties> </object> </objectgroup> diff --git a/maps/009-7.tmx b/maps/009-7.tmx index 50f27687..6d4adff8 100644 --- a/maps/009-7.tmx +++ b/maps/009-7.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" nextobjectid="4"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="4"> <properties> <property name="minimap" value="graphics/minimaps/009-7.png"/> <property name="music" value="magick-real.ogg"/> @@ -10,7 +10,7 @@ <tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/> <tileset firstgid="355" source="../tilesets/cave2_sewer_mine_x4.tsx"/> - <layer name="Ground1" width="150" height="150"> + <layer id="1" name="Ground1" width="150" height="150"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -164,7 +164,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="150" height="150"> + <layer id="2" name="Ground2" width="150" height="150"> <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, @@ -318,7 +318,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 </data> </layer> - <layer name="Ground3" width="150" height="150"> + <layer id="3" name="Ground3" width="150" height="150"> <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, @@ -472,7 +472,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 </data> </layer> - <layer name="Fringe" width="150" height="150" visible="0"> + <layer id="4" name="Fringe" width="150" height="150" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -626,7 +626,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 </data> </layer> - <layer name="Over1" width="150" height="150"> + <layer id="5" name="Over1" width="150" height="150"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -780,7 +780,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Collision" width="150" height="150"> + <layer id="6" name="Collision" width="150" height="150"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -934,12 +934,12 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Hurnscald Storage" type="warp" x="672" y="608" width="32" height="32"> <properties> <property name="dest_map" value="009-2"/> - <property name="dest_tile_x" value="38"/> - <property name="dest_tile_y" value="104"/> + <property name="dest_x" value="38"/> + <property name="dest_y" value="104"/> </properties> </object> <object id="2" name="graphics/particles/firespot.particle.xml" type="particle_effect" x="1370" y="1728" width="32" height="32"/> diff --git a/maps/009-8.tmx b/maps/009-8.tmx index f8b1cff0..1e5d0558 100644 --- a/maps/009-8.tmx +++ b/maps/009-8.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="100" height="153" tilewidth="32" tileheight="32" infinite="0" nextlayerid="17" nextobjectid="36"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="153" tilewidth="32" tileheight="32" infinite="0" nextlayerid="17" nextobjectid="36"> <properties> <property name="Authors" value="Tezer,Gumi"/> <property name="music" value="despair.ogg"/> @@ -2424,15 +2424,15 @@ <object id="6" name="To Outside" type="warp" x="832" y="3904" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="74"/> - <property name="dest_tile_y" value="50"/> + <property name="dest_x" value="74"/> + <property name="dest_y" value="50"/> </properties> </object> <object id="8" name="To Back Entrance" type="warp" x="704" y="4288" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="72"/> - <property name="dest_tile_y" value="54"/> + <property name="dest_x" value="72"/> + <property name="dest_y" value="54"/> </properties> </object> <object id="11" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="704" y="3936" width="32" height="32"> @@ -2488,93 +2488,93 @@ <object id="23" name="To Hall" type="warp" x="1760" y="1760" width="64" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="127"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="127"/> </properties> </object> <object id="24" name="To Hall" type="warp" x="1696" y="1280" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="127"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="127"/> </properties> </object> <object id="25" name="To Hall" type="warp" x="1856" y="1280" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="116"/> - <property name="dest_tile_y" value="127"/> + <property name="dest_x" value="116"/> + <property name="dest_y" value="127"/> </properties> </object> <object id="26" name="To Tower" type="warp" x="2528" y="3168" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="117"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="117"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="27" name="To Tower" type="warp" x="2784" y="2496" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="86"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="86"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="28" name="To Tower" type="warp" x="2784" y="1792" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="55"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="55"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="29" name="To Tower" type="warp" x="2528" y="1248" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="30" name="To Tower" type="warp" x="1056" y="1248" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="117"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="117"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="31" name="To Tower" type="warp" x="768" y="1792" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="86"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="86"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="32" name="To Tower" type="warp" x="768" y="2496" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="55"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="55"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="33" name="To Tower" type="warp" x="1024" y="3136" width="32" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="34" name="To Basement" type="warp" x="1280" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="82"/> - <property name="dest_tile_y" value="126"/> + <property name="dest_x" value="82"/> + <property name="dest_y" value="126"/> <property name="ignore" value="this"/> </properties> </object> <object id="35" name="To Upper Floor" type="warp" x="2656" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="39"/> - <property name="dest_tile_y" value="126"/> + <property name="dest_x" value="39"/> + <property name="dest_y" value="126"/> <property name="ignore" value="this"/> </properties> </object> diff --git a/maps/010-1.tmx b/maps/010-1.tmx index 343cfdff..de8ef336 100644 --- a/maps/010-1.tmx +++ b/maps/010-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="19"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="19"> <properties> <property name="minimap" value="graphics/minimaps/010-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -103,11 +103,11 @@ 3,3,3,3,3,3,3,3,3,3,3,143,145,124,123,89,89,89,89,57,178,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,19,19,51,51,108,46,93,61,78,101,84,86,86,86,86,86,86,87,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,85,87,101,102,84,86,87,51,3,51,51,85,83,102,102,103,3,67,67,3,3,3,51,51,3,3,3,76,77,77,77,78,3,3,67,3,3,3,3,3,3,3,3,3,3,3,3,3,35,35,3,35,35,3,35,3,3,3,88,89,89,89, 3,35,3,35,3,3,3,3,3,3,3,159,89,89,89,89,89,89,89,142,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,51,51,51,51,51,51,108,46,93,61,78,101,84,86,86,86,86,83,103,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,101,103,3,3,85,86,87,51,51,51,51,101,103,3,3,3,3,67,67,3,3,51,3,3,67,3,3,92,93,93,93,94,3,67,67,3,3,67,3,3,3,3,3,3,3,3,3,3,3,35,35,35,35,35,3,3,3,122,40,89,89,89, 3,3,3,3,3,3,3,3,3,3,3,159,89,145,89,89,89,89,57,178,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,19,19,19,19,51,51,51,108,46,93,61,78,85,86,86,86,83,103,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,69,70,70,100,83,103,51,3,3,51,3,3,3,51,51,67,67,51,67,51,67,51,3,3,3,3,108,109,109,109,110,3,3,3,3,35,3,3,3,3,3,3,3,3,3,3,3,35,35,35,35,35,3,35,3,121,123,89,89,89,89, -3,35,3,3,3,3,3,3,3,3,3,104,176,56,89,89,89,89,146,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,51,51,51,51,19,19,51,51,51,108,46,93,94,101,84,86,86,87,3,3,3,3,3,3,3,69,71,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,101,102,102,102,103,3,3,3,3,3,51,51,3,3,51,51,51,51,67,51,3,51,3,3,3,3,3,3,3,3,3,3,3,3,67,3,3,3,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,88,89,89,89,140,105, -3,3,3,35,3,3,3,3,3,3,3,3,3,137,89,89,89,89,41,130,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,51,51,19,51,51,51,3,92,93,94,3,85,86,83,103,3,3,3,3,3,3,3,85,99,70,71,3,3,3,3,3,3,3,3,3,3,3,3,51,51,3,3,51,3,3,3,51,51,3,51,3,51,3,3,51,3,3,51,51,51,3,51,3,3,35,3,3,3,3,3,3,3,3,3,3,67,3,35,3,3,51,3,3,3,3,19,19,3,3,3,3,3,3,3,3,3,88,89,89,57,141,3, -3,3,3,3,3,3,3,3,3,3,3,3,3,175,177,56,89,89,89,124,125,3,3,3,3,3,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,19,51,51,51,3,3,3,92,93,94,3,85,86,87,3,3,3,35,35,3,3,3,3,84,86,87,3,3,3,3,3,3,3,3,3,3,51,3,51,35,3,51,51,3,3,51,51,3,51,51,51,51,3,51,3,51,51,51,51,51,3,3,51,3,35,3,35,35,3,3,35,35,3,3,35,3,3,51,3,3,3,3,3,3,3,3,19,19,3,3,19,19,19,3,3,3,88,89,89,90,3,3, -3,3,35,3,3,3,3,3,35,3,3,3,3,3,3,104,56,89,89,89,124,130,3,3,3,3,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,19,19,3,3,3,3,92,93,94,3,101,102,103,3,3,3,3,3,35,3,3,3,101,102,103,3,3,3,3,3,3,3,3,3,3,3,3,51,3,51,3,51,3,51,51,3,3,51,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,3,3,3,243,217,19,19,69,71,19,19,19,3,3,3,88,89,89,90,3,3, -3,3,3,3,3,3,3,3,3,35,3,3,3,3,3,3,143,89,161,89,89,124,128,130,3,3,51,3,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,51,51,3,92,93,94,51,51,3,3,3,51,35,3,35,3,3,51,3,51,51,51,3,3,3,3,3,3,69,70,71,3,51,3,35,51,3,3,51,51,3,3,3,3,51,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,185,19,101,103,19,19,19,3,3,122,40,89,89,142,3,3, +3,35,3,3,3,3,3,3,3,3,3,104,176,56,89,89,89,89,146,3,3,3,3,3,3,3,3,3,3,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,3,51,51,51,51,19,19,51,51,51,108,46,93,94,101,84,86,86,87,3,3,3,3,3,3,3,69,71,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,101,102,102,102,103,3,3,3,3,3,51,51,3,3,51,51,51,51,67,51,3,51,3,3,3,3,3,3,3,3,3,3,3,3,67,3,3,3,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,88,89,89,89,140,105, +3,3,3,35,3,3,3,3,3,3,3,3,3,137,89,89,89,89,41,130,3,3,3,3,3,3,3,3,3,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,3,3,3,3,51,51,19,51,51,51,3,92,93,94,3,85,86,83,103,3,3,3,3,3,3,3,85,99,70,71,3,3,3,3,3,3,3,3,3,3,3,3,51,51,3,3,51,3,3,3,51,51,3,51,3,51,3,3,51,3,3,51,51,51,3,51,3,3,35,3,3,3,3,3,3,3,3,3,3,67,3,35,3,3,51,3,3,3,3,19,19,3,3,3,3,3,3,3,3,3,88,89,89,57,141,3, +3,3,3,3,3,3,3,3,3,3,3,3,3,175,177,56,89,89,89,124,125,3,3,3,3,3,51,51,51,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,3,3,3,3,19,51,51,51,3,3,3,92,93,94,3,85,86,87,3,3,3,35,35,3,3,3,3,84,86,87,3,3,3,3,3,3,3,3,3,3,51,3,51,35,3,51,51,3,3,51,51,3,51,51,51,51,3,51,3,51,51,51,51,51,3,3,51,3,35,3,35,35,3,3,35,35,3,3,35,3,3,51,3,3,3,3,3,3,3,3,19,19,3,3,19,19,19,3,3,3,88,89,89,90,3,3, +3,3,35,3,3,3,3,3,35,3,3,3,3,3,3,104,56,89,89,89,124,130,3,3,3,3,51,51,51,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,3,3,3,3,3,19,19,3,3,3,3,92,93,94,3,101,102,103,3,3,3,3,3,35,3,3,3,101,102,103,3,3,3,3,3,3,3,3,3,3,3,3,51,3,51,3,51,3,51,51,3,3,51,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,3,3,3,243,217,19,19,69,71,19,19,19,3,3,3,88,89,89,90,3,3, +3,3,3,3,3,3,3,3,3,35,3,3,3,3,3,3,143,89,161,89,89,124,128,130,3,3,51,3,51,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,3,3,3,3,3,3,3,3,51,51,3,92,93,94,51,51,3,3,3,51,35,3,35,3,3,51,3,51,51,51,3,3,3,3,3,3,69,70,71,3,51,3,35,51,3,3,51,51,3,3,3,3,51,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,185,19,101,103,19,19,19,3,3,122,40,89,89,142,3,3, 3,3,3,35,3,3,3,3,3,3,35,3,3,3,3,3,159,89,89,89,89,89,89,162,3,3,3,3,51,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,3,3,3,3,3,3,3,3,3,51,51,92,93,94,51,51,51,3,51,3,35,51,35,35,51,51,3,51,51,3,51,3,3,3,3,69,100,83,103,3,3,51,35,35,35,35,51,3,3,51,3,3,51,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,3,3,243,201,185,19,19,19,19,181,3,121,123,89,89,57,141,3,3, 3,3,35,3,3,3,3,3,3,3,3,3,3,3,3,3,137,89,89,89,89,89,89,41,128,130,3,51,51,519,519,519,519,519,519,519,533,519,519,519,519,519,519,519,3,3,3,3,3,3,3,35,35,3,35,92,93,94,51,3,3,51,3,3,51,3,3,3,3,51,3,35,3,51,51,35,51,35,35,101,102,103,3,51,51,51,35,51,3,3,51,3,51,3,3,51,51,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,51,51,3,3,3,3,243,218,183,184,185,181,197,251,88,89,89,89,90,3,3,3, 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,138,56,89,89,89,89,89,89,89,146,51,3,3,539,539,539,539,539,539,539,549,539,539,539,539,539,539,539,3,3,3,3,3,3,3,51,3,3,35,92,93,94,51,51,3,51,51,51,3,51,3,3,35,3,3,51,51,51,51,35,3,35,51,3,3,3,3,3,3,35,51,3,51,3,3,3,3,3,51,51,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,51,3,3,3,3,250,215,216,218,212,229,3,88,89,89,89,90,3,3,3, @@ -634,7 +634,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 </data> </layer> - <layer id="6" name="Collision" width="150" height="120"> + <layer id="6" name="Collision" width="150" height="120" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -758,136 +758,136 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup id="7" name="Objects"> + <objectgroup id="7" name="Objects" visible="0"> <object id="1" name="To Woodland" type="warp" x="1536" y="768" width="64" height="32"> <properties> <property name="dest_map" value="011-1"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="103"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="103"/> </properties> </object> <object id="2" name="Scorpion" type="spawn" x="2336" y="1728" width="640" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="monster_id" value="1"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="3" name="SpikyMushroom" type="spawn" x="1088" y="1984" width="1024" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="monster_id" value="17"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="4" name="To Woodland" type="warp" x="416" y="1728" width="32" height="64"> <properties> <property name="dest_map" value="015-1"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="54"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="54"/> </properties> </object> <object id="5" name="To Dimond's Cove" type="warp" x="1152" y="3008" width="32" height="32"> <properties> <property name="dest_map" value="010-2"/> - <property name="dest_tile_x" value="32"/> - <property name="dest_tile_y" value="44"/> + <property name="dest_x" value="32"/> + <property name="dest_y" value="44"/> </properties> </object> <object id="6" name="To Woodland" type="warp" x="1760" y="3360" width="96" height="32"> <properties> <property name="dest_map" value="016-1"/> - <property name="dest_tile_x" value="56"/> - <property name="dest_tile_y" value="19"/> + <property name="dest_x" value="56"/> + <property name="dest_y" value="19"/> </properties> </object> <object id="7" name="To Woodland" type="warp" x="4192" y="1696" width="32" height="64"> <properties> <property name="dest_map" value="007-1"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="53"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="53"/> </properties> </object> <object id="8" name="PinkFlower" type="spawn" x="0" y="0"> <properties> - <property name="eA_spawn" value="50"/> <property name="max_beings" value="30"/> <property name="monster_id" value="12"/> + <property name="spawn" value="50"/> </properties> </object> <object id="9" name="Snail" type="spawn" x="0" y="0"> <properties> - <property name="eA_spawn" value="50"/> <property name="max_beings" value="20"/> <property name="monster_id" value="39"/> + <property name="spawn" value="50"/> </properties> </object> <object id="10" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_spawn" value="50"/> <property name="max_beings" value="45"/> <property name="monster_id" value="17"/> + <property name="spawn" value="50"/> </properties> </object> <object id="11" name="LogHead" type="spawn" x="0" y="0"> <properties> - <property name="eA_spawn" value="100"/> <property name="max_beings" value="40"/> <property name="monster_id" value="23"/> + <property name="spawn" value="100"/> </properties> </object> <object id="12" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> + <property name="death" value="10"/> <property name="max_beings" value="15"/> <property name="monster_id" value="26"/> </properties> </object> <object id="13" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="270000"/> + <property name="death" value="180000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="27"/> + <property name="spawn" value="270000"/> </properties> </object> <object id="14" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="28"/> + <property name="spawn" value="2700000"/> </properties> </object> <object id="15" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="33"/> + <property name="spawn" value="60000"/> </properties> </object> <object id="16" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> <object id="17" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> <property name="max_beings" value="25"/> <property name="monster_id" value="36"/> + <property name="spawn" value="30"/> </properties> </object> <object id="18" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> + <property name="spawn" value="30"/> </properties> </object> </objectgroup> diff --git a/maps/010-2.tmx b/maps/010-2.tmx index 3b327164..aea514a0 100644 --- a/maps/010-2.tmx +++ b/maps/010-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="107" height="110" tilewidth="32" tileheight="32" nextobjectid="9"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="107" height="110" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="9"> <properties> <property name="music" value="dimonds-cove.ogg"/> <property name="name" value="Dimond's Cove"/> @@ -9,7 +9,7 @@ <tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/> <tileset firstgid="355" source="../tilesets/woodland_village.tsx"/> - <layer name="Ground1" width="107" height="110"> + <layer id="1" name="Ground1" width="107" height="110"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -123,7 +123,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="107" height="110"> + <layer id="2" name="Ground2" width="107" height="110"> <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, @@ -237,7 +237,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 </data> </layer> - <layer name="Fringe" width="107" height="110"> + <layer id="3" name="Fringe" width="107" height="110"> <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, @@ -351,7 +351,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 </data> </layer> - <layer name="Over1" width="107" height="110"> + <layer id="4" name="Over1" width="107" height="110"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -465,7 +465,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Over2" width="107" height="110"> + <layer id="5" name="Over2" width="107" height="110"> <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, @@ -579,7 +579,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 </data> </layer> - <layer name="Collision" width="107" height="110"> + <layer id="6" name="Collision" width="107" height="110"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -693,54 +693,54 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Cellar" type="warp" x="864" y="768" width="32" height="32"> <properties> <property name="dest_map" value="010-2"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="68"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="68"/> </properties> </object> <object id="2" name="To Outside" type="warp" x="1024" y="1440" width="32" height="32"> <properties> <property name="dest_map" value="010-1"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="95"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="95"/> </properties> </object> <object id="3" name="To Second Floor" type="warp" x="1248" y="864" width="96" height="32"> <properties> <property name="dest_map" value="010-2"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="28"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="28"/> </properties> </object> <object id="4" name="To First Floor" type="warp" x="1152" y="2176" width="32" height="32"> <properties> <property name="dest_map" value="010-2"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="24"/> </properties> </object> <object id="5" name="To Third Floor" type="warp" x="2112" y="864" width="96" height="32"> <properties> <property name="dest_map" value="010-2"/> - <property name="dest_tile_x" value="67"/> - <property name="dest_tile_y" value="72"/> + <property name="dest_x" value="67"/> + <property name="dest_y" value="72"/> </properties> </object> <object id="6" name="To First Floor" type="warp" x="2624" y="928" width="96" height="32"> <properties> <property name="dest_map" value="010-2"/> - <property name="dest_tile_x" value="40"/> - <property name="dest_tile_y" value="28"/> + <property name="dest_x" value="40"/> + <property name="dest_y" value="28"/> </properties> </object> <object id="7" name="To Second Floor" type="warp" x="2112" y="2336" width="96" height="32"> <properties> <property name="dest_map" value="010-2"/> - <property name="dest_tile_x" value="67"/> - <property name="dest_tile_y" value="28"/> + <property name="dest_x" value="67"/> + <property name="dest_y" value="28"/> </properties> </object> </objectgroup> diff --git a/maps/011-1.tmx b/maps/011-1.tmx index 5eb3eabd..0e8b58db 100644 --- a/maps/011-1.tmx +++ b/maps/011-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="154" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="23"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="154" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="23"> <properties> <property name="minimap" value="graphics/minimaps/011-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -662,36 +662,36 @@ <object id="3" name="To Hermit's Cave" type="warp" x="1856" y="2944" width="32" height="32"> <properties> <property name="dest_map" value="011-3"/> - <property name="dest_tile_x" value="0"/> - <property name="dest_tile_y" value="0"/> + <property name="dest_x" value="0"/> + <property name="dest_y" value="0"/> </properties> </object> <object id="4" name="To Woodland" type="warp" x="960" y="1920" width="32" height="96"> <properties> <property name="dest_map" value="014-1"/> - <property name="dest_tile_x" value="108"/> - <property name="dest_tile_y" value="91"/> + <property name="dest_x" value="108"/> + <property name="dest_y" value="91"/> </properties> </object> <object id="5" name="To Woodland" type="warp" x="1536" y="3328" width="64" height="32"> <properties> <property name="dest_map" value="010-1"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="6" name="To Hurnscald Outskirts" type="warp" x="3968" y="1920" width="32" height="128"> <properties> <property name="dest_map" value="008-1"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="7" name="To Woodland Hills" type="warp" x="2304" y="288" width="64" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="132"/> - <property name="dest_tile_y" value="175"/> + <property name="dest_x" value="132"/> + <property name="dest_y" value="175"/> </properties> </object> <object id="8" name="EvilMushroom" type="spawn" x="0" y="0"> @@ -720,54 +720,54 @@ </object> <object id="12" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> + <property name="death" value="10"/> <property name="max_beings" value="5"/> <property name="monster_id" value="26"/> </properties> </object> <object id="13" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="270000"/> + <property name="death" value="180000"/> + <property name="spawn" value="270000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="27"/> </properties> </object> <object id="14" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="30"/> </properties> </object> <object id="15" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="33"/> </properties> </object> <object id="16" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> <object id="17" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="25"/> <property name="monster_id" value="36"/> </properties> </object> <object id="18" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> </properties> @@ -775,27 +775,27 @@ <object id="19" name="To Bandit Cave" type="warp" x="1216" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="100"/> </properties> </object> <object id="20" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> + <property name="death" value="10"/> <property name="max_beings" value="5"/> <property name="monster_id" value="26"/> </properties> </object> <object id="21" name="ManaBug" type="spawn" x="32" y="32"> <properties> - <property name="eA_spawn" value="30"/> + <property name="spawn" value="30"/> <property name="max_beings" value="18"/> <property name="monster_id" value="1131"/> </properties> </object> <object id="22" name="Maggot" type="spawn" x="2400" y="960" width="1152" height="928"> <properties> - <property name="eA_spawn" value="30"/> + <property name="spawn" value="30"/> <property name="max_beings" value="10"/> <property name="monster_id" value="1002"/> </properties> diff --git a/maps/011-3.tmx b/maps/011-3.tmx index 8e287c33..87a3a5e1 100644 --- a/maps/011-3.tmx +++ b/maps/011-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="60" height="60" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="7"> <properties> <property name="minimap" value="graphics/minimaps/011-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -11,7 +11,7 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/cave.tsx"/> <tileset firstgid="131" source="../tilesets/cave_x2.tsx"/> - <layer name="Ground1" width="60" height="60"> + <layer id="1" name="Ground1" width="60" height="60"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -75,7 +75,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="60" height="60"> + <layer id="2" name="Fringe" width="60" height="60"> <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, @@ -139,7 +139,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 name="Over1" width="60" height="60"> + <layer id="3" name="Over1" width="60" height="60"> <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, @@ -203,7 +203,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 name="Collision" width="60" height="60"> + <layer id="4" name="Collision" width="60" height="60"> <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, @@ -267,34 +267,34 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="928" y="736" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="992" y="736" width="32" height="32"/> - <object name="Arkim the Hermit" type="npc" x="976" y="752"> + <objectgroup id="5" name="Objects" visible="0"> + <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="928" y="736" width="32" height="32"/> + <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="992" y="736" width="32" height="32"/> + <object id="3" name="Arkim the Hermit" type="npc" x="976" y="752"> <properties> <property name="npc_id" value="116"/> <property name="script" value=""/> </properties> </object> - <object name="To Lake Cave" type="warp" x="992" y="448" width="32" height="32"> + <object id="4" name="To Lake Cave" type="warp" x="992" y="448" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="73"/> - <property name="dest_tile_y" value="10"/> + <property name="dest_x" value="73"/> + <property name="dest_y" value="10"/> </properties> </object> - <object name="Bat" type="spawn" x="0" y="0"> + <object id="5" name="Bat" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="10"/> <property name="monster_id" value="15"/> </properties> </object> - <object name="Silkworm" type="spawn" x="0" y="0"> + <object id="6" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="33"/> </properties> diff --git a/maps/011-4.tmx b/maps/011-4.tmx index 8440d2dc..567e79b1 100644 --- a/maps/011-4.tmx +++ b/maps/011-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" nextobjectid="19"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="19"> <properties> <property name="minimap" value="graphics/minimaps/011-4.png"/> <property name="music" value="cavesong.ogg"/> @@ -10,7 +10,7 @@ <tileset firstgid="131" source="../tilesets/cave_x2.tsx"/> <tileset firstgid="147" source="../tilesets/cave_bilevel.tsx"/> <tileset firstgid="403" source="../tilesets/woodland_ground.tsx"/> - <layer name="Ground1" width="150" height="150"> + <layer id="1" name="Ground1" width="150" height="150"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -164,7 +164,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="150" height="150"> + <layer id="2" name="Fringe" width="150" height="150"> <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, @@ -318,7 +318,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 </data> </layer> - <layer name="Over1" width="150" height="150"> + <layer id="3" name="Over1" width="150" height="150"> <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, @@ -472,7 +472,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 </data> </layer> - <layer name="Collision" width="150" height="150"> + <layer id="4" name="Collision" width="150" height="150"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -626,134 +626,134 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="5" name="Objects"> <object id="1" name="SpikyMushroom" type="spawn" x="1056" y="352" width="1280" height="1280"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="monster_id" value="17"/> </properties> </object> <object id="2" name="CaveSnake" type="spawn" x="2368" y="3040" width="1280" height="1280"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="monster_id" value="19"/> </properties> </object> <object id="3" name="To Hermit's Cave" type="warp" x="2336" y="256" width="32" height="32"> <properties> <property name="dest_map" value="011-3"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="16"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="16"/> </properties> </object> <object id="4" name="To Hurnscald Cave" type="warp" x="4128" y="2752" width="32" height="32"> <properties> <property name="dest_map" value="009-3"/> - <property name="dest_tile_x" value="20"/> - <property name="dest_tile_y" value="56"/> + <property name="dest_x" value="20"/> + <property name="dest_y" value="56"/> </properties> </object> <object id="5" name="To Bandit Cave" type="warp" x="1248" y="1120" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="47"/> - <property name="dest_tile_y" value="184"/> + <property name="dest_x" value="47"/> + <property name="dest_y" value="184"/> </properties> </object> <object id="6" name="To Bryant Cave" type="warp" x="512" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="205"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="205"/> </properties> </object> <object id="7" name="To Bandit Cave" type="warp" x="2848" y="640" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="168"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="168"/> </properties> </object> <object id="8" name="To Bandit Cave" type="warp" x="3360" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="183"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="183"/> </properties> </object> <object id="9" name="To Bandit Cave" type="warp" x="3648" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="123"/> - <property name="dest_tile_y" value="212"/> + <property name="dest_x" value="123"/> + <property name="dest_y" value="212"/> </properties> </object> <object id="10" name="To Bandit Cave" type="warp" x="2752" y="2400" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="95"/> - <property name="dest_tile_y" value="226"/> + <property name="dest_x" value="95"/> + <property name="dest_y" value="226"/> </properties> </object> <object id="11" name="To Bandit Cave" type="warp" x="1984" y="2752" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="68"/> - <property name="dest_tile_y" value="234"/> + <property name="dest_x" value="68"/> + <property name="dest_y" value="234"/> </properties> </object> <object id="12" name="To Small Cave" type="warp" x="992" y="160" width="64" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="186"/> - <property name="dest_tile_y" value="181"/> + <property name="dest_x" value="186"/> + <property name="dest_y" value="181"/> </properties> </object> <object id="13" name="To Small Cave" type="warp" x="1440" y="3776" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="266"/> - <property name="dest_tile_y" value="181"/> + <property name="dest_x" value="266"/> + <property name="dest_y" value="181"/> </properties> </object> <object id="14" name="CaveSnake" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="40"/> <property name="monster_id" value="19"/> </properties> </object> <object id="15" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="15"/> <property name="monster_id" value="17"/> </properties> </object> <object id="16" name="CaveMaggot" type="spawn" x="1024" y="1312" width="1824" height="2432"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="54"/> </properties> </object> <object id="17" name="CaveMaggot" type="spawn" x="256" y="128" width="3552" height="1152"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="54"/> </properties> </object> <object id="18" name="Bat" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="180000"/> + <property name="death" value="40000"/> + <property name="spawn" value="180000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="15"/> </properties> diff --git a/maps/011-6.tmx b/maps/011-6.tmx index e853c9a7..459f67f6 100644 --- a/maps/011-6.tmx +++ b/maps/011-6.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="300" height="300" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="77"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="300" height="300" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="77"> <properties> <property name="music" value="cavesong.ogg"/> <property name="name" value="Bandit Cave"/> @@ -1543,531 +1543,531 @@ <object id="1" name="To Small Bandit Cave" type="warp" x="1632" y="2400" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="260"/> - <property name="dest_tile_y" value="127"/> + <property name="dest_x" value="260"/> + <property name="dest_y" value="127"/> </properties> </object> <object id="2" name="To Small Bandit Cave" type="warp" x="1952" y="2272" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="270"/> - <property name="dest_tile_y" value="124"/> + <property name="dest_x" value="270"/> + <property name="dest_y" value="124"/> </properties> </object> <object id="3" name="To Bandit Cave" type="warp" x="8640" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="61"/> - <property name="dest_tile_y" value="72"/> + <property name="dest_x" value="61"/> + <property name="dest_y" value="72"/> </properties> </object> <object id="4" name="To Bandit Cave" type="warp" x="8320" y="4096" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="76"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="76"/> </properties> </object> <object id="5" name="To Bandit Cave" type="warp" x="4640" y="3776" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="47"/> - <property name="dest_tile_y" value="119"/> + <property name="dest_x" value="47"/> + <property name="dest_y" value="119"/> </properties> </object> <object id="6" name="To Small Bandit Cave" type="warp" x="6272" y="832" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="261"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="261"/> + <property name="dest_y" value="46"/> </properties> </object> <object id="7" name="To Second Bandit Cave" type="warp" x="8352" y="1504" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="196"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="196"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="8" name="To Bandit Cave" type="warp" x="8672" y="1664" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="98"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="98"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="9" name="To Small Bandit Cave" type="warp" x="3136" y="960" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="271"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="271"/> + <property name="dest_y" value="51"/> </properties> </object> <object id="10" name="To Second Bandit Cave" type="warp" x="1504" y="3840" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="145"/> - <property name="dest_tile_y" value="117"/> + <property name="dest_x" value="145"/> + <property name="dest_y" value="117"/> </properties> </object> <object id="11" name="To Woodland" type="warp" x="1568" y="3232" width="32" height="32"> <properties> <property name="dest_map" value="011-1"/> - <property name="dest_tile_x" value="38"/> - <property name="dest_tile_y" value="37"/> + <property name="dest_x" value="38"/> + <property name="dest_y" value="37"/> </properties> </object> <object id="12" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="3865" y="7123" width="11" height="11"/> <object id="13" name="To Lake Cave" type="warp" x="768" y="6592" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="16"/> - <property name="dest_tile_y" value="58"/> + <property name="dest_x" value="16"/> + <property name="dest_y" value="58"/> </properties> </object> <object id="14" name="To Lake Cave" type="warp" x="1504" y="5920" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="39"/> - <property name="dest_tile_y" value="36"/> + <property name="dest_x" value="39"/> + <property name="dest_y" value="36"/> </properties> </object> <object id="15" name="To Lake Cave" type="warp" x="3104" y="5408" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="89"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="89"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="16" name="To Lake Cave" type="warp" x="3616" y="5824" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="106"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="106"/> + <property name="dest_y" value="33"/> </properties> </object> <object id="17" name="To Lake Cave" type="warp" x="3904" y="6752" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="115"/> - <property name="dest_tile_y" value="62"/> + <property name="dest_x" value="115"/> + <property name="dest_y" value="62"/> </properties> </object> <object id="18" name="To Lake Cave" type="warp" x="3008" y="7200" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="87"/> - <property name="dest_tile_y" value="76"/> + <property name="dest_x" value="87"/> + <property name="dest_y" value="76"/> </properties> </object> <object id="19" name="To Lake Cave" type="warp" x="2176" y="7520" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="62"/> - <property name="dest_tile_y" value="87"/> + <property name="dest_x" value="62"/> + <property name="dest_y" value="87"/> </properties> </object> <object id="20" name="To Lake Cave" type="warp" x="8032" y="8896" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="111"/> - <property name="dest_tile_y" value="122"/> + <property name="dest_x" value="111"/> + <property name="dest_y" value="122"/> </properties> </object> <object id="21" name="To Lake Cave" type="warp" x="5920" y="5824" width="64" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="32"/> - <property name="dest_tile_y" value="6"/> + <property name="dest_x" value="32"/> + <property name="dest_y" value="6"/> </properties> </object> <object id="22" name="To Lake Cave" type="warp" x="8512" y="5824" width="32" height="32"> <properties> <property name="dest_map" value="011-4"/> - <property name="dest_tile_x" value="45"/> - <property name="dest_tile_y" value="119"/> + <property name="dest_x" value="45"/> + <property name="dest_y" value="119"/> </properties> </object> <object id="23" name="graphics/particles/flame.particle.xml" type="particle_effect" x="8000" y="7616" width="32" height="32"/> <object id="24" name="To Bandit Lord Cave" type="warp" x="5568" y="8192" width="32" height="32"> <properties> <property name="dest_map" value="011-6"/> - <property name="dest_tile_x" value="264"/> - <property name="dest_tile_y" value="237"/> + <property name="dest_x" value="264"/> + <property name="dest_y" value="237"/> </properties> </object> <object id="25" name="Silkworm" type="spawn" x="352" y="288" width="9088" height="4096"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="9"/> <property name="monster_id" value="33"/> </properties> </object> <object id="26" name="Bandit" type="spawn" x="7936" y="672" width="992" height="1120"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="27" name="Bandit" type="spawn" x="7776" y="3040" width="1248" height="1248"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="28" name="Bandit" type="spawn" x="3968" y="3488" width="576" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="29" name="Bandit" type="spawn" x="5184" y="1792" width="576" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="30" name="Bandit" type="spawn" x="1888" y="1920" width="576" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="31" name="Bandit" type="spawn" x="6016" y="3104" width="576" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="32" name="Bandit" type="spawn" x="6016" y="608" width="576" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="33" name="Bandit" type="spawn" x="896" y="864" width="576" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="34" name="Bandit" type="spawn" x="2880" y="512" width="1472" height="1568"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="60000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="62"/> </properties> </object> <object id="35" name="Bandit" type="spawn" x="736" y="2848" width="576" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="62"/> </properties> </object> <object id="36" name="Bat" type="spawn" x="5184" y="6976" width="3968" height="2112"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="37" name="Bat" type="spawn" x="5280" y="5216" width="3808" height="832"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="15"/> </properties> </object> <object id="38" name="Bat" type="spawn" x="8160" y="448" width="160" height="4064"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="15"/> </properties> </object> <object id="39" name="Bat" type="spawn" x="6080" y="448" width="160" height="4064"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="9"/> <property name="monster_id" value="15"/> </properties> </object> <object id="40" name="Bat" type="spawn" x="3968" y="3328" width="2816" height="448"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="9"/> <property name="monster_id" value="15"/> </properties> </object> <object id="41" name="Bat" type="spawn" x="736" y="704" width="3360" height="3104"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="23"/> <property name="monster_id" value="15"/> </properties> </object> <object id="42" name="Bat" type="spawn" x="448" y="4704" width="4160" height="3136"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="9"/> <property name="monster_id" value="15"/> </properties> </object> <object id="43" name="SpikyMushroom" type="spawn" x="4800" y="2912" width="1184" height="1216"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="17"/> </properties> </object> <object id="44" name="SpikyMushroom" type="spawn" x="5792" y="1856" width="1184" height="1216"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="17"/> </properties> </object> <object id="45" name="SpikyMushroom" type="spawn" x="2368" y="4800" width="960" height="896"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="17"/> </properties> </object> <object id="46" name="SpikyMushroom" type="spawn" x="992" y="3328" width="1152" height="640"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="17"/> </properties> </object> <object id="47" name="EvilMushroom" type="spawn" x="5344" y="2560" width="672" height="928"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="11"/> </properties> </object> <object id="48" name="EvilMushroom" type="spawn" x="5888" y="1120" width="672" height="928"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="11"/> </properties> </object> <object id="49" name="EvilMushroom" type="spawn" x="896" y="3296" width="1536" height="800"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="11"/> </properties> </object> <object id="50" name="EvilMushroom" type="spawn" x="1824" y="5152" width="448" height="576"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="11"/> </properties> </object> <object id="51" name="SpikyMushroom" type="spawn" x="2752" y="7008" width="960" height="480"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="17"/> </properties> </object> <object id="52" name="SpikyMushroom" type="spawn" x="7488" y="1152" width="1728" height="544"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="17"/> </properties> </object> <object id="53" name="EvilMushroom" type="spawn" x="8384" y="1088" width="704" height="928"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="11"/> </properties> </object> <object id="54" name="YellowSlime" type="spawn" x="2560" y="2112" width="1024" height="832"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="5"/> </properties> </object> <object id="55" name="YellowSlime" type="spawn" x="1600" y="768" width="640" height="832"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="5"/> </properties> </object> <object id="56" name="YellowSlime" type="spawn" x="544" y="1824" width="640" height="832"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="5"/> </properties> </object> <object id="57" name="YellowSlime" type="spawn" x="1728" y="3072" width="480" height="352"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="5"/> </properties> </object> <object id="58" name="YellowSlime" type="spawn" x="1472" y="1760" width="320" height="416"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="5"/> </properties> </object> <object id="59" name="YellowSlime" type="spawn" x="3968" y="1056" width="320" height="416"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="5"/> </properties> </object> <object id="60" name="YellowSlime" type="spawn" x="1184" y="5504" width="320" height="416"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="5"/> </properties> </object> <object id="61" name="YellowSlime" type="spawn" x="2112" y="7136" width="320" height="416"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="5"/> </properties> </object> <object id="62" name="YellowSlime" type="spawn" x="512" y="6336" width="320" height="416"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="5"/> </properties> </object> <object id="63" name="YellowSlime" type="spawn" x="3520" y="5888" width="320" height="416"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="5"/> </properties> </object> <object id="64" name="YellowSlime" type="spawn" x="4256" y="6368" width="320" height="416"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="5"/> </properties> </object> <object id="65" name="CaveSnake" type="spawn" x="2080" y="6816" width="960" height="480"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="19"/> </properties> </object> <object id="66" name="CaveSnake" type="spawn" x="3232" y="6496" width="960" height="480"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="19"/> </properties> </object> <object id="67" name="CaveSnake" type="spawn" x="832" y="5696" width="1024" height="1024"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="19"/> </properties> </object> <object id="68" name="CaveSnake" type="spawn" x="1760" y="4096" width="1024" height="1024"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="19"/> </properties> </object> <object id="69" name="CaveSnake" type="spawn" x="2656" y="5632" width="960" height="480"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="19"/> </properties> </object> <object id="70" name="CaveMaggot" type="spawn" x="5376" y="7872" width="320" height="416"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="54"/> </properties> </object> <object id="71" name="CaveMaggot" type="spawn" x="8160" y="7488" width="544" height="192"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="54"/> </properties> diff --git a/maps/012-1.tmx b/maps/012-1.tmx index 1c709d07..37f0eded 100644 --- a/maps/012-1.tmx +++ b/maps/012-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="168" height="188" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="168" height="188" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="44"> <properties> <property name="minimap" value="graphics/minimaps/012-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -15,7 +15,7 @@ <tileset firstgid="291" source="../tilesets/woodland_x3.tsx"/> <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> <tileset firstgid="579" source="../tilesets/woodland_water.tsx"/> - <layer name="Ground1" width="168" height="188"> + <layer id="1" name="Ground1" width="168" height="188"> <data encoding="csv"> 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,183,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,243,201,185,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,183,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,243,201,185,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, @@ -207,7 +207,7 @@ 19,19,19,3,51,19,51,19,35,35,19,35,19,35,3,35,19,51,35,3,51,35,19,3,51,51,35,19,35,3,51,19,51,19,19,3,51,51,35,198,200,198,199,199,200,199,212,213,213,198,199,199,234,199,35,19,51,51,51,19,19,19,19,19,19,19,19,181,182,183,183,183,183,183,183,184,182,183,183,183,183,183,183,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,67,19,19,19,19,19,19,19,19,51,138,105,105,105,176,105,193,105,105,19,19,19,19,89,89,90,19,19,3,3,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,213,198,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199 </data> </layer> - <layer name="Fringe" width="168" height="188"> + <layer id="2" name="Fringe" width="168" height="188"> <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, @@ -399,7 +399,7 @@ 291,292,0,291,292,0,293,294,293,294,291,292,0,0,0,0,0,0,0,291,292,0,291,292,293,294,0,0,0,0,0,0,119,0,0,0,0,0,227,0,0,184,182,198,0,211,0,0,0,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,219,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,171,0,0,179,0,0,0,187,95,97,559,0,0,0,0,0,0,0,0,0,0,0,187,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="168" height="188"> + <layer id="3" name="Over1" width="168" height="188"> <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,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -591,7 +591,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,293,294,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="168" height="188"> + <layer id="4" name="Collision" width="168" height="188"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -783,186 +783,200 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="2589" y="3435"/> - <object name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="3805" y="3310"/> - <object name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="4285" y="3278"/> - <object name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="3980" y="3310"/> - <object name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="4268" y="3053"/> - <object name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="2445" y="3215"/> - <object name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="3805" y="3090"/> - <object name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="4188" y="2835"/> - <object name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="2300" y="5135"/> - <object name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="3980" y="3090"/> - <object name="graphics/particles/waterfall-2x4.particle.xml" type="particle_effect" x="1917" y="2665"/> - <object name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="958" y="4492"/> - <object name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="1180" y="4749"/> - <object name="graphics/particles/hillunderfall.particle.xml" type="particle_effect" x="1545" y="5000"/> - <object name="graphics/particles/apple.particle.xml" type="particle_effect" x="2717" y="3315"/> - <object name="To Moggun Cave" type="warp" x="1632" y="1248" width="32" height="32"> + <objectgroup id="5" name="Objects" visible="0"> + <object id="1" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="2589" y="3435"/> + <object id="2" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="3805" y="3310"/> + <object id="3" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="4285" y="3278"/> + <object id="4" name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="3980" y="3310"/> + <object id="5" name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="4268" y="3053"/> + <object id="6" name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="2445" y="3215"/> + <object id="7" name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="3805" y="3090"/> + <object id="8" name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="4188" y="2835"/> + <object id="9" name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="2300" y="5135"/> + <object id="10" name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="3980" y="3090"/> + <object id="11" name="graphics/particles/waterfall-2x4.particle.xml" type="particle_effect" x="1917" y="2665"/> + <object id="12" name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="958" y="4492"/> + <object id="13" name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="1180" y="4749"/> + <object id="14" name="graphics/particles/hillunderfall.particle.xml" type="particle_effect" x="1545" y="5000"/> + <object id="15" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2717" y="3315"/> + <object id="16" name="To Moggun Cave" type="warp" x="1632" y="1248" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="370"/> - <property name="dest_tile_y" value="43"/> + <property name="dest_x" value="370"/> + <property name="dest_y" value="43"/> </properties> </object> - <object name="To Moggun Cave" type="warp" x="4704" y="2144" width="32" height="32"> + <object id="17" name="To Moggun Cave" type="warp" x="4704" y="2144" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="474"/> - <property name="dest_tile_y" value="106"/> + <property name="dest_x" value="474"/> + <property name="dest_y" value="106"/> </properties> </object> - <object name="To Moggun Cave" type="warp" x="1312" y="1536" width="32" height="32"> + <object id="18" name="To Moggun Cave" type="warp" x="1312" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="353"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="353"/> + <property name="dest_y" value="78"/> </properties> </object> - <object name="To Moggun Cave" type="warp" x="1408" y="2816" width="32" height="32"> + <object id="19" name="To Moggun Cave" type="warp" x="1408" y="2816" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="355"/> - <property name="dest_tile_y" value="187"/> + <property name="dest_x" value="355"/> + <property name="dest_y" value="187"/> </properties> </object> - <object name="To Moggun Cave" type="warp" x="2944" y="3328" width="32" height="32"> + <object id="20" name="To Moggun Cave" type="warp" x="2944" y="3328" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="270"/> - <property name="dest_tile_y" value="111"/> + <property name="dest_x" value="270"/> + <property name="dest_y" value="111"/> </properties> </object> - <object name="To Small Cave" type="warp" x="3136" y="3168" width="32" height="32"> + <object id="21" name="To Small Cave" type="warp" x="3136" y="3168" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="37"/> - <property name="dest_tile_y" value="81"/> + <property name="dest_x" value="37"/> + <property name="dest_y" value="81"/> </properties> </object> - <object name="To Small Cave" type="warp" x="3488" y="2944" width="32" height="32"> + <object id="22" name="To Small Cave" type="warp" x="3488" y="2944" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="80"/> - <property name="dest_tile_y" value="73"/> + <property name="dest_x" value="80"/> + <property name="dest_y" value="73"/> </properties> </object> - <object name="To Mana Seed Cave" type="warp" x="3936" y="2880" width="32" height="32"> + <object id="23" name="To Mana Seed Cave" type="warp" x="3936" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="38"/> - <property name="dest_tile_y" value="156"/> + <property name="dest_x" value="38"/> + <property name="dest_y" value="156"/> </properties> </object> - <object name="To Woodland Hills" type="warp" x="4800" y="1888" width="32" height="128"> + <object id="24" name="To Woodland Hills" type="warp" x="4800" y="1888" width="32" height="128"> <properties> <property name="dest_map" value="013-1"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="75"/> </properties> </object> - <object name="To Woodland" type="warp" x="4192" y="5632" width="64" height="32"> + <object id="25" name="To Woodland" type="warp" x="4192" y="5632" width="64" height="32"> <properties> <property name="dest_map" value="011-1"/> - <property name="dest_tile_x" value="73"/> - <property name="dest_tile_y" value="10"/> + <property name="dest_x" value="73"/> + <property name="dest_y" value="10"/> </properties> </object> - <object name="To Moggun Cave" type="warp" x="2080" y="4032" width="32" height="32"> + <object id="26" name="To Moggun Cave" type="warp" x="2080" y="4032" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="176"/> - <property name="dest_tile_y" value="140"/> + <property name="dest_x" value="176"/> + <property name="dest_y" value="140"/> </properties> </object> - <object name="PinkFlower" type="spawn" x="0" y="0"> + <object id="27" name="PinkFlower" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="13"/> <property name="monster_id" value="12"/> </properties> </object> - <object name="SpikyMushroom" type="spawn" x="0" y="0"> + <object id="28" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> + <property name="death" value="10"/> <property name="max_beings" value="25"/> <property name="monster_id" value="17"/> </properties> </object> - <object name="Mouboo" type="spawn" x="0" y="0"> + <object id="29" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> + <property name="death" value="10"/> <property name="max_beings" value="20"/> <property name="monster_id" value="26"/> </properties> </object> - <object name="MauvePlant" type="spawn" x="0" y="0"> + <object id="30" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="27"/> + <property name="spawn" value="2700000"/> </properties> </object> - <object name="CobaltPlant" type="spawn" x="0" y="0"> + <object id="31" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="28"/> + <property name="spawn" value="2700000"/> </properties> </object> - <object name="GambogePlant" type="spawn" x="0" y="0"> + <object id="32" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="29"/> + <property name="spawn" value="2700000"/> </properties> </object> - <object name="AlizarinPlant" type="spawn" x="0" y="0"> + <object id="33" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="30"/> + <property name="spawn" value="2700000"/> </properties> </object> - <object name="Silkworm" type="spawn" x="0" y="0"> + <object id="34" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="33"/> + <property name="spawn" value="60000"/> </properties> </object> - <object name="CloverPatch" type="spawn" x="0" y="0"> + <object id="35" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> - <object name="Squirrel" type="spawn" x="0" y="0"> + <object id="36" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> <property name="max_beings" value="25"/> <property name="monster_id" value="36"/> + <property name="spawn" value="30"/> </properties> </object> - <object name="Butterfly" type="spawn" x="0" y="0"> + <object id="37" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> <property name="max_beings" value="20"/> <property name="monster_id" value="53"/> + <property name="spawn" value="30"/> + </properties> + </object> + <object id="38" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2732" y="3308"/> + <object id="39" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2729" y="3318"/> + <object id="40" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2717" y="3306"/> + <object id="41" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2707" y="3312"/> + <object id="42" name="PinkFlower" type="spawn" x="1952" y="4576" width="384" height="192"> + <properties> + <property name="death" value="250"/> + <property name="max_beings" value="2"/> + <property name="monster_id" value="12"/> + </properties> + </object> + <object id="43" name="PinkFlower" type="spawn" x="672" y="1600" width="224" height="288"> + <properties> + <property name="death" value="250"/> + <property name="max_beings" value="2"/> + <property name="monster_id" value="12"/> </properties> </object> - <object name="graphics/particles/apple.particle.xml" type="particle_effect" x="2732" y="3308"/> - <object name="graphics/particles/apple.particle.xml" type="particle_effect" x="2729" y="3318"/> - <object name="graphics/particles/apple.particle.xml" type="particle_effect" x="2717" y="3306"/> - <object name="graphics/particles/apple.particle.xml" type="particle_effect" x="2707" y="3312"/> </objectgroup> </map> diff --git a/maps/012-3.tmx b/maps/012-3.tmx index dd70b666..03963a74 100644 --- a/maps/012-3.tmx +++ b/maps/012-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="520" height="210" tilewidth="32" tileheight="32" nextobjectid="31"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="520" height="210" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="31"> <properties> <property name="minimap" value="graphics/minimaps/012-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -13,7 +13,7 @@ <tileset firstgid="147" source="../tilesets/cave_bilevel.tsx"/> <tileset firstgid="403" source="../tilesets/woodland_ground.tsx"/> <tileset firstgid="659" source="../tilesets/cave_ani_wetwall.tsx"/> - <layer name="Ground1" width="520" height="210"> + <layer id="1" name="Ground1" width="520" height="210"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -227,7 +227,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="520" height="210"> + <layer id="2" name="Ground2" width="520" height="210"> <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, @@ -441,7 +441,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="520" height="210"> + <layer id="3" name="Fringe" width="520" height="210"> <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, @@ -655,7 +655,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="520" height="210"> + <layer id="4" name="Over1" width="520" height="210"> <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, @@ -869,7 +869,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="520" height="210"> + <layer id="5" name="Collision" width="520" height="210"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1083,187 +1083,187 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="6" name="Objects" visible="0"> <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1953" y="4544" width="32" height="32"/> <object id="2" name="graphics/particles/hillunderfall2.particle.xml" type="particle_effect" x="4800" y="5700" width="64" height="64"/> <object id="3" name="To Woodland Hills" type="warp" x="1184" y="2624" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="98"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="98"/> + <property name="dest_y" value="100"/> </properties> </object> <object id="4" name="To Woodland Hills" type="warp" x="2560" y="2368" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="109"/> - <property name="dest_tile_y" value="93"/> + <property name="dest_x" value="109"/> + <property name="dest_y" value="93"/> </properties> </object> <object id="5" name="To Woodland Hills" type="warp" x="1216" y="5024" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="123"/> - <property name="dest_tile_y" value="91"/> + <property name="dest_x" value="123"/> + <property name="dest_y" value="91"/> </properties> </object> <object id="6" name="To Woodland Hills" type="warp" x="8640" y="3584" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="105"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="105"/> </properties> </object> <object id="7" name="To Blossom Land" type="warp" x="5632" y="4416" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="65"/> - <property name="dest_tile_y" value="128"/> + <property name="dest_x" value="65"/> + <property name="dest_y" value="128"/> </properties> </object> <object id="8" name="To Blossom Land" type="warp" x="11360" y="6016" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="89"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="89"/> </properties> </object> <object id="9" name="To Small Lost Land" type="warp" x="11840" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="40"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="40"/> </properties> </object> <object id="10" name="To Lost Land" type="warp" x="11296" y="2528" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="41"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="41"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="11" name="To Small Closed Hill" type="warp" x="15136" y="3392" width="32" height="32"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="146"/> - <property name="dest_tile_y" value="67"/> + <property name="dest_x" value="146"/> + <property name="dest_y" value="67"/> </properties> </object> <object id="12" name="To Terranite Cave" type="warp" x="14336" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="012-4"/> - <property name="dest_tile_x" value="193"/> - <property name="dest_tile_y" value="57"/> + <property name="dest_x" value="193"/> + <property name="dest_y" value="57"/> </properties> </object> <object id="13" name="Moggun" type="spawn" x="14048" y="1984" width="608" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="14" name="Moggun" type="spawn" x="13856" y="1344" width="608" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="15" name="Moggun" type="spawn" x="12896" y="896" width="608" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="16" name="Moggun" type="spawn" x="10976" y="992" width="288" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="17" name="Moggun" type="spawn" x="11360" y="2944" width="576" height="608"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="59"/> </properties> </object> <object id="18" name="Moggun" type="spawn" x="13984" y="2496" width="608" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="19" name="Moggun" type="spawn" x="12160" y="4320" width="576" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="20" name="Moggun" type="spawn" x="12960" y="2240" width="288" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="21" name="Moggun" type="spawn" x="11968" y="4768" width="576" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="22" name="Moggun" type="spawn" x="13632" y="3488" width="288" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="23" name="Moggun" type="spawn" x="10432" y="2944" width="288" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="24" name="Moggun" type="spawn" x="8352" y="4128" width="576" height="608"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="59"/> </properties> </object> <object id="25" name="Moggun" type="spawn" x="5760" y="1376" width="576" height="608"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="59"/> </properties> </object> <object id="26" name="Moggun" type="spawn" x="5024" y="3104" width="576" height="608"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="59"/> </properties> @@ -1271,16 +1271,16 @@ <object id="27" name="graphics/particles/flame.particle.xml" type="particle_effect" x="8640" y="4416" width="32" height="32"/> <object id="28" name="Bat" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="100"/> <property name="monster_id" value="15"/> </properties> </object> <object id="29" name="CaveSnake" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="75"/> <property name="monster_id" value="19"/> </properties> diff --git a/maps/012-4.tmx b/maps/012-4.tmx index 58171459..6a266a35 100644 --- a/maps/012-4.tmx +++ b/maps/012-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="520" height="210" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="94"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="520" height="210" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="94"> <properties> <property name="music" value="cavesong.ogg"/> <property name="name" value="Terranite Cave"/> @@ -871,532 +871,532 @@ <object id="1" name="To Moggun Cave" type="warp" x="6176" y="1856" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> - <property name="dest_tile_x" value="448"/> - <property name="dest_tile_y" value="62"/> + <property name="dest_x" value="448"/> + <property name="dest_y" value="62"/> </properties> </object> <object id="2" name="To Small Cave" type="warp" x="11616" y="832" width="32" height="32"> <properties> <property name="dest_map" value="012-4"/> - <property name="dest_tile_x" value="474"/> - <property name="dest_tile_y" value="187"/> + <property name="dest_x" value="474"/> + <property name="dest_y" value="187"/> </properties> </object> <object id="3" name="To Terranite Cave" type="warp" x="15168" y="6016" width="32" height="32"> <properties> <property name="dest_map" value="012-4"/> - <property name="dest_tile_x" value="363"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="363"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="4" name="Moggun" type="spawn" x="6752" y="1408" width="416" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="59"/> </properties> </object> <object id="5" name="Moggun" type="spawn" x="6944" y="928" width="416" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="59"/> </properties> </object> <object id="6" name="Moggun" type="spawn" x="7456" y="1504" width="416" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="59"/> </properties> </object> <object id="7" name="Moggun" type="spawn" x="6208" y="1120" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="59"/> </properties> </object> <object id="8" name="Bat" type="spawn" x="6624" y="992" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="9" name="Bat" type="spawn" x="7616" y="1088" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="10" name="Bat" type="spawn" x="7488" y="1760" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="11" name="Bat" type="spawn" x="7136" y="2208" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="12" name="Bat" type="spawn" x="6560" y="2944" width="320" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="13" name="Bat" type="spawn" x="8320" y="800" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="14" name="Bat" type="spawn" x="8672" y="1408" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="15" name="Bat" type="spawn" x="8448" y="2112" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="16" name="Bat" type="spawn" x="8192" y="2400" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="17" name="Bat" type="spawn" x="8672" y="2400" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="18" name="Moggun" type="spawn" x="8192" y="2688" width="800" height="512"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="59"/> </properties> </object> <object id="19" name="Spider" type="spawn" x="5600" y="3808" width="2240" height="1792"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="50"/> <property name="monster_id" value="10"/> </properties> </object> <object id="20" name="YellowSlime" type="spawn" x="7840" y="4480" width="640" height="1504"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> <object id="21" name="YellowSlime" type="spawn" x="5088" y="5248" width="576" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> <object id="22" name="RedSlime" type="spawn" x="4480" y="5280" width="576" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="6"/> </properties> </object> <object id="23" name="RedSlime" type="spawn" x="3936" y="2464" width="576" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="6"/> </properties> </object> <object id="24" name="YellowSlime" type="spawn" x="4224" y="3840" width="576" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> <object id="25" name="YellowSlime" type="spawn" x="1088" y="3968" width="576" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> <object id="26" name="Spider" type="spawn" x="1664" y="1504" width="832" height="992"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="10"/> </properties> </object> <object id="27" name="YellowSlime" type="spawn" x="1952" y="2528" width="576" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> <object id="28" name="Terranite" type="spawn" x="832" y="928" width="576" height="1088"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="60"/> </properties> </object> <object id="29" name="Skeleton" type="spawn" x="1664" y="896" width="800" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="41"/> </properties> </object> <object id="30" name="Skeleton" type="spawn" x="2816" y="3424" width="800" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="41"/> </properties> </object> <object id="31" name="YellowSlime" type="spawn" x="2624" y="4032" width="576" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> <object id="32" name="LadySkeleton" type="spawn" x="1664" y="3360" width="480" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="42"/> </properties> </object> <object id="33" name="Terranite" type="spawn" x="1120" y="5440" width="512" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="60"/> </properties> </object> <object id="34" name="LadySkeleton" type="spawn" x="3456" y="5408" width="800" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="42"/> </properties> </object> <object id="35" name="LadySkeleton" type="spawn" x="8800" y="5504" width="800" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="42"/> </properties> </object> <object id="36" name="Skeleton" type="spawn" x="10496" y="5344" width="800" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="41"/> </properties> </object> <object id="37" name="Spider" type="spawn" x="11392" y="4128" width="2240" height="1760"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="40"/> <property name="monster_id" value="10"/> </properties> </object> <object id="38" name="Terranite" type="spawn" x="11136" y="832" width="672" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="60"/> </properties> </object> <object id="39" name="Terranite" type="spawn" x="15104" y="3136" width="640" height="800"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="60"/> </properties> </object> <object id="40" name="Skeleton" type="spawn" x="13536" y="3392" width="800" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="41"/> </properties> </object> <object id="41" name="LadySkeleton" type="spawn" x="14880" y="2368" width="800" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="42"/> </properties> </object> <object id="42" name="YellowSlime" type="spawn" x="11040" y="2656" width="640" height="1504"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> <object id="43" name="RedSlime" type="spawn" x="10688" y="4096" width="576" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="6"/> </properties> </object> <object id="44" name="RedSlime" type="spawn" x="11936" y="2368" width="1088" height="512"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="6"/> </properties> </object> <object id="45" name="Bat" type="spawn" x="12992" y="992" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="46" name="Bat" type="spawn" x="13120" y="2208" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="47" name="Bat" type="spawn" x="12544" y="1888" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="48" name="Bat" type="spawn" x="9952" y="5696" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="49" name="Bat" type="spawn" x="12992" y="3744" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="50" name="Bat" type="spawn" x="14496" y="3040" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="51" name="Bat" type="spawn" x="4128" y="4832" width="320" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="52" name="Bat" type="spawn" x="4768" y="3072" width="320" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="53" name="Bat" type="spawn" x="3904" y="2016" width="320" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="54" name="Bat" type="spawn" x="2464" y="5696" width="320" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="55" name="Bat" type="spawn" x="1824" y="5024" width="320" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="56" name="Bat" type="spawn" x="8576" y="4896" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="57" name="Bat" type="spawn" x="8544" y="5696" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="58" name="RedSlime" type="spawn" x="10048" y="4160" width="576" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="6"/> </properties> </object> <object id="59" name="Bat" type="spawn" x="14336" y="3424" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="60" name="Spider" type="spawn" x="13344" y="1088" width="384" height="1056"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="10"/> </properties> </object> <object id="61" name="Spider" type="spawn" x="11936" y="928" width="480" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="10"/> </properties> </object> <object id="62" name="Terranite" type="spawn" x="3840" y="1184" width="320" height="800"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="60"/> </properties> </object> <object id="63" name="Bat" type="spawn" x="2432" y="3456" width="320" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="64" name="Skeleton" type="spawn" x="1024" y="4384" width="672" height="384"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="41"/> </properties> </object> <object id="65" name="Spider" type="spawn" x="1152" y="4768" width="384" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="10"/> </properties> </object> <object id="66" name="Bat" type="spawn" x="2912" y="5696" width="320" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="67" name="Spider" type="spawn" x="2560" y="5600" width="768" height="352"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="10"/> </properties> diff --git a/maps/013-1.tmx b/maps/013-1.tmx index 3edcaa4b..3ff63d6f 100644 --- a/maps/013-1.tmx +++ b/maps/013-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="154" height="124" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="154" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="24"> <properties> <property name="minimap" value="graphics/minimaps/013-1.png"/> <property name="music" value="mystique-forest.ogg"/> @@ -14,7 +14,7 @@ <tileset firstgid="259" source="../tilesets/woodland_x2.tsx"/> <tileset firstgid="291" source="../tilesets/woodland_x3.tsx"/> <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> - <layer name="Ground1" width="154" height="124"> + <layer id="1" name="Ground1" width="154" height="124"> <data encoding="csv"> 19,19,19,19,19,19,19,19,19,19,19,19,233,217,201,185,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, 19,19,19,19,19,19,19,19,19,19,19,19,19,233,217,201,185,19,43,44,19,19,19,19,43,44,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, @@ -142,7 +142,7 @@ 123,89,89,57,106,69,83,102,103,19,59,60,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,181,182,183,183,183,183,183,183,183,212,213,251,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19 </data> </layer> - <layer name="Ground2" width="154" height="124"> + <layer id="2" name="Ground2" width="154" height="124"> <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,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -270,7 +270,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,0,0,95,96,97,0,195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,211,202,195,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,0,0,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="154" height="124"> + <layer id="3" name="Fringe" width="154" height="124"> <data encoding="csv"> 0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,291,292,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,0,0,293,294,0,0,0,0,0,293,294,0,0,291,292,0, 0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,293,294,0,291,292,0,0,293,294,0,0,0,0,291,292,0,291,292,0,293,294,0,0,0,293,294,291,292,0,0,293,294,291,292,0,293,294,0,0,0,293,294,0,0,0,0,293,294,0,0,291,292,0,291,292,0,293,294,0,291,292,293,294,0,291,292,0,0,0,0,0,293,294,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0, @@ -398,7 +398,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="154" height="124"> + <layer id="4" name="Over1" width="154" height="124"> <data encoding="csv"> 0,0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -526,7 +526,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,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,0,0,0,0,0,0,0,0,0,0,0,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0 </data> </layer> - <layer name="Over2" width="154" height="124"> + <layer id="5" name="Over2" width="154" height="124"> <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, @@ -654,7 +654,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 </data> </layer> - <layer name="Collision" width="154" height="124"> + <layer id="6" name="Collision" width="154" height="124"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -782,159 +782,159 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="3593" y="3209" width="32" height="32"/> - <object name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="1259" y="3200" width="32" height="32"/> - <object name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="1193" y="2793" width="32" height="32"/> - <object name="To Woodland Hills Cave" type="warp" x="4000" y="3328" width="32" height="32"> + <objectgroup id="7" name="Objects" visible="0"> + <object id="1" name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="3593" y="3209" width="32" height="32"/> + <object id="2" name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="1259" y="3200" width="32" height="32"/> + <object id="3" name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="1193" y="2793" width="32" height="32"/> + <object id="4" name="To Woodland Hills Cave" type="warp" x="4000" y="3328" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="34"/> - <property name="dest_tile_y" value="64"/> + <property name="dest_x" value="34"/> + <property name="dest_y" value="64"/> </properties> </object> - <object name="To Woodland Hills" type="warp" x="640" y="2368" width="32" height="128"> + <object id="5" name="To Woodland Hills" type="warp" x="640" y="2368" width="32" height="128"> <properties> <property name="dest_map" value="012-1"/> - <property name="dest_tile_x" value="149"/> - <property name="dest_tile_y" value="60"/> + <property name="dest_x" value="149"/> + <property name="dest_y" value="60"/> </properties> </object> - <object name="To Woodland Hills" type="warp" x="1408" y="640" width="128" height="32"> + <object id="6" name="To Woodland Hills" type="warp" x="1408" y="640" width="128" height="32"> <properties> <property name="dest_map" value="017-1"/> - <property name="dest_tile_x" value="46"/> - <property name="dest_tile_y" value="104"/> + <property name="dest_x" value="46"/> + <property name="dest_y" value="104"/> </properties> </object> - <object name="To Magic House" type="warp" x="1344" y="2880" width="32" height="32"> + <object id="7" name="To Magic House" type="warp" x="1344" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="013-2"/> - <property name="dest_tile_x" value="63"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="63"/> + <property name="dest_y" value="41"/> </properties> </object> - <object name="PinkFlower" type="spawn" x="0" y="0"> + <object id="8" name="PinkFlower" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="13"/> <property name="monster_id" value="12"/> </properties> </object> - <object name="SpikyMushroom" type="spawn" x="0" y="0"> + <object id="9" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="12"/> <property name="monster_id" value="17"/> </properties> </object> - <object name="Mouboo" type="spawn" x="0" y="0"> + <object id="10" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="5"/> <property name="monster_id" value="26"/> </properties> </object> - <object name="MauvePlant" type="spawn" x="0" y="0"> + <object id="11" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180"/> - <property name="eA_spawn" value="270"/> + <property name="death" value="180"/> + <property name="spawn" value="270"/> <property name="max_beings" value="1"/> <property name="monster_id" value="27"/> </properties> </object> - <object name="MauvePlant" type="spawn" x="0" y="0"> + <object id="12" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="27"/> </properties> </object> - <object name="CobaltPlant" type="spawn" x="0" y="0"> + <object id="13" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180"/> - <property name="eA_spawn" value="270"/> + <property name="death" value="180"/> + <property name="spawn" value="270"/> <property name="max_beings" value="1"/> <property name="monster_id" value="28"/> </properties> </object> - <object name="CobaltPlant" type="spawn" x="0" y="0"> + <object id="14" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="28"/> </properties> </object> - <object name="GambogePlant" type="spawn" x="0" y="0"> + <object id="15" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180"/> - <property name="eA_spawn" value="270"/> + <property name="death" value="180"/> + <property name="spawn" value="270"/> <property name="max_beings" value="1"/> <property name="monster_id" value="29"/> </properties> </object> - <object name="GambogePlant" type="spawn" x="0" y="0"> + <object id="16" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="29"/> </properties> </object> - <object name="AlizarinPlant" type="spawn" x="0" y="0"> + <object id="17" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180"/> - <property name="eA_spawn" value="270"/> + <property name="death" value="180"/> + <property name="spawn" value="270"/> <property name="max_beings" value="1"/> <property name="monster_id" value="30"/> </properties> </object> - <object name="AlizarinPlant" type="spawn" x="0" y="0"> + <object id="18" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="30"/> </properties> </object> - <object name="Silkworm" type="spawn" x="0" y="0"> + <object id="19" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="33"/> </properties> </object> - <object name="CloverPatch" type="spawn" x="0" y="0"> + <object id="20" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> - <object name="Squirrel" type="spawn" x="0" y="0"> + <object id="21" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="25"/> <property name="monster_id" value="36"/> </properties> </object> - <object name="Butterfly" type="spawn" x="0" y="0"> + <object id="22" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> </properties> </object> - <object name="To Woodland Hills" type="warp" x="4352" y="1600" width="32" height="128"> + <object id="23" name="To Woodland Hills" type="warp" x="4352" y="1600" width="32" height="128"> <properties> <property name="dest_map" value="055-1"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="52"/> </properties> </object> </objectgroup> diff --git a/maps/013-2.tmx b/maps/013-2.tmx index 69908851..44695430 100644 --- a/maps/013-2.tmx +++ b/maps/013-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="88" height="63" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="88" height="63" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="18"> <properties> <property name="music" value="magick-real.ogg"/> <property name="name" value="Magic House"/> @@ -7,9 +7,9 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/> - <tileset firstgid="291" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="307" source="../tilesets/woodland_village.tsx"/> - <layer name="Ground1" width="88" height="63"> + <tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/> + <tileset firstgid="355" source="../tilesets/woodland_village.tsx"/> + <layer id="1" name="Ground1" width="88" height="63"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -76,7 +76,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Fringe" width="88" height="63"> + <layer id="2" name="Fringe" width="88" height="63"> <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, @@ -98,23 +98,23 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,479,0,13,12,10,11,9,14,15,12,0,0,0,0,0,5,12,190,12,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,190,29,8,9,10,12,30,31,11,0,0,0,0,0,21,12,0,206,207,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,270,558,558,155,156,0,0,0,242,291,271,295,294,294,0,274,242,222,223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,527,0,13,12,10,11,9,14,15,12,0,0,0,0,0,5,12,190,12,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,543,190,29,8,9,10,12,30,31,11,0,0,0,0,0,21,12,0,206,207,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,270,606,606,155,156,0,0,0,242,307,271,311,310,310,0,274,242,222,223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,0,0,0,0,0,0,0,0,0,0,0,36,0,0,0,37,0,238,239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,261,262,197,0,0,0,0,0,0,0,0,0,0,0,0,0,173,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,164,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,196,243,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,458,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,482,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,97,0,12,292,11,29,8,8,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,297,298,242,0,292,0,226,0,0,83,297,298,295,294,294,294,293,293,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,302,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,530,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,97,0,12,308,11,29,8,8,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,313,314,242,0,308,0,226,0,0,83,313,314,311,310,310,310,309,309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,318,319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,228,229,197,195,227,228,229,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,558,304,305,306,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,228,229,197,195,227,228,229,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,320,321,322,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,243,244,245,197,195,243,244,245,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,115,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,243,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -143,7 +143,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 </data> </layer> - <layer name="Over1" width="88" height="63"> + <layer id="3" name="Over1" width="88" height="63"> <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, @@ -210,7 +210,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 </data> </layer> - <layer name="Collision" width="88" height="63"> + <layer id="4" name="Collision" width="88" height="63"> <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,2,2,2,2,2,2, @@ -277,40 +277,40 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/cookingfire.hoveringpot.particle.xml" type="particle_effect" x="753" y="851" width="32" height="32"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="1200" y="721" width="2" height="2"/> - <object name="graphics/particles/sparkle.big.green.particle.xml" type="particle_effect" x="770" y="829" width="8" height="8"/> - <object name="graphics/particles/sparkle.big.green.particle.xml" type="particle_effect" x="1064" y="669" width="64" height="16"/> - <object name="graphics/particles/sparkle.big.green.particle.xml" type="particle_effect" x="896" y="697" width="8" height="8"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="720" y="1072" width="2" height="2"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="690" y="965" width="3" height="3"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="818" y="897" width="3" height="3"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="850" y="928" width="3" height="3"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="818" y="773" width="3" height="3"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="883" y="897" width="3" height="3"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="882" y="804" width="3" height="3"/> - <object name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="915" y="963" width="3" height="3"/> - <object name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="2080" y="1152" width="32" height="32"/> - <object name="To Outside" type="warp" x="2016" y="1344" width="32" height="32"> + <objectgroup id="5" name="Objects" visible="0"> + <object id="1" name="graphics/particles/cookingfire.hoveringpot.particle.xml" type="particle_effect" x="753" y="851" width="32" height="32"/> + <object id="2" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="1200" y="721" width="2" height="2"/> + <object id="3" name="graphics/particles/sparkle.big.green.particle.xml" type="particle_effect" x="770" y="829" width="8" height="8"/> + <object id="4" name="graphics/particles/sparkle.big.green.particle.xml" type="particle_effect" x="1064" y="669" width="64" height="16"/> + <object id="5" name="graphics/particles/sparkle.big.green.particle.xml" type="particle_effect" x="896" y="697" width="8" height="8"/> + <object id="6" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="720" y="1072" width="2" height="2"/> + <object id="7" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="690" y="965" width="3" height="3"/> + <object id="8" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="818" y="897" width="3" height="3"/> + <object id="9" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="850" y="928" width="3" height="3"/> + <object id="10" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="818" y="773" width="3" height="3"/> + <object id="11" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="883" y="897" width="3" height="3"/> + <object id="12" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="882" y="804" width="3" height="3"/> + <object id="13" name="graphics/particles/sparkle.green.particle.xml" type="particle_effect" x="915" y="963" width="3" height="3"/> + <object id="14" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="2080" y="1152" width="32" height="32"/> + <object id="15" name="To Outside" type="warp" x="2016" y="1344" width="32" height="32"> <properties> <property name="dest_map" value="013-1"/> - <property name="dest_tile_x" value="42"/> - <property name="dest_tile_y" value="91"/> + <property name="dest_x" value="42"/> + <property name="dest_y" value="91"/> </properties> </object> - <object name="To Magic Room" type="warp" x="2144" y="1152" width="32" height="32"> + <object id="16" name="To Magic Room" type="warp" x="2144" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="013-2"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="40"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="40"/> </properties> </object> - <object name="To Magic House Entrance" type="warp" x="672" y="1312" width="32" height="32"> + <object id="17" name="To Magic House Entrance" type="warp" x="672" y="1312" width="32" height="32"> <properties> <property name="dest_map" value="013-2"/> - <property name="dest_tile_x" value="67"/> - <property name="dest_tile_y" value="37"/> + <property name="dest_x" value="67"/> + <property name="dest_y" value="37"/> </properties> </object> </objectgroup> diff --git a/maps/013-3.tmx b/maps/013-3.tmx index 1cd18260..cf7aee9f 100644 --- a/maps/013-3.tmx +++ b/maps/013-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="75"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="75"> <properties> <property name="minimap" value="graphics/minimaps/013-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -1044,380 +1044,380 @@ <object id="1" name="To Woodland Hills" type="warp" x="896" y="640" width="32" height="32"> <properties> <property name="dest_map" value="013-1"/> - <property name="dest_tile_x" value="0"/> - <property name="dest_tile_y" value="0"/> + <property name="dest_x" value="0"/> + <property name="dest_y" value="0"/> </properties> </object> <object id="2" name="To Woodland Hills" type="warp" x="1088" y="2016" width="32" height="32"> <properties> <property name="dest_map" value="013-1"/> - <property name="dest_tile_x" value="125"/> - <property name="dest_tile_y" value="103"/> + <property name="dest_x" value="125"/> + <property name="dest_y" value="103"/> </properties> </object> <object id="3" name="To Woodland Hills Cave" type="warp" x="1152" y="3072" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="79"/> - <property name="dest_tile_y" value="126"/> + <property name="dest_x" value="79"/> + <property name="dest_y" value="126"/> </properties> </object> <object id="4" name="To Woodland Hills Cave" type="warp" x="2528" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="96"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="96"/> </properties> </object> <object id="5" name="To Woodland Mining Camp" type="warp" x="704" y="3680" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="115"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="115"/> + <property name="dest_y" value="41"/> </properties> </object> <object id="6" name="To Woodland Mining Camp" type="warp" x="4448" y="1440" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="127"/> - <property name="dest_tile_y" value="37"/> + <property name="dest_x" value="127"/> + <property name="dest_y" value="37"/> </properties> </object> <object id="7" name="To Woodland Mining Camp" type="warp" x="1952" y="5728" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="134"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="134"/> + <property name="dest_y" value="46"/> </properties> </object> <object id="8" name="To Northern Mine" type="warp" x="2208" y="4576" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="50"/> - <property name="dest_tile_y" value="89"/> + <property name="dest_x" value="50"/> + <property name="dest_y" value="89"/> </properties> </object> <object id="9" name="To Woodland Mining Camp" type="warp" x="2592" y="3296" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="147"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="147"/> + <property name="dest_y" value="41"/> </properties> </object> <object id="10" name="To Jack O Land" type="warp" x="5664" y="2912" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="177"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="177"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="11" name="To Northern Mine" type="warp" x="5696" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="70"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="70"/> </properties> </object> <object id="12" name="To Northern Mine" type="warp" x="5408" y="1440" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="27"/> - <property name="dest_tile_y" value="55"/> + <property name="dest_x" value="27"/> + <property name="dest_y" value="55"/> </properties> </object> <object id="13" name="To Northern Mine" type="warp" x="4864" y="896" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="134"/> - <property name="dest_tile_y" value="62"/> + <property name="dest_x" value="134"/> + <property name="dest_y" value="62"/> </properties> </object> <object id="14" name="To Northern Mine" type="warp" x="3936" y="3328" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="172"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="172"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="15" name="To Northern Mine" type="warp" x="4704" y="3328" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="177"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="177"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="16" name="To Northern Mine" type="warp" x="5056" y="2112" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="27"/> - <property name="dest_tile_y" value="90"/> + <property name="dest_x" value="27"/> + <property name="dest_y" value="90"/> </properties> </object> <object id="17" name="To Woodland Hills Cave" type="warp" x="2400" y="1632" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="109"/> - <property name="dest_tile_y" value="65"/> + <property name="dest_x" value="109"/> + <property name="dest_y" value="65"/> </properties> </object> <object id="18" name="To Woodland Hills Cave" type="warp" x="3488" y="2048" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="75"/> - <property name="dest_tile_y" value="50"/> + <property name="dest_x" value="75"/> + <property name="dest_y" value="50"/> </properties> </object> <object id="19" name="To Northern Mine" type="warp" x="2144" y="1632" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="90"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="90"/> + <property name="dest_y" value="51"/> </properties> </object> <object id="20" name="To Demon Mask Chest Cave" type="warp" x="2272" y="640" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="39"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="39"/> </properties> </object> <object id="21" name="To Fight Cave" type="warp" x="896" y="1312" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="71"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="71"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="22" name="To Black Scorpion Cave" type="warp" x="2272" y="1344" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="109"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="109"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="23" name="To Woodland Hills Cave" type="warp" x="3488" y="640" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="71"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="71"/> + <property name="dest_y" value="41"/> </properties> </object> <object id="24" name="To Magic Bookshelf Cave" type="warp" x="3552" y="1344" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="71"/> - <property name="dest_tile_y" value="123"/> + <property name="dest_x" value="71"/> + <property name="dest_y" value="123"/> </properties> </object> <object id="25" name="To Northern Mine" type="warp" x="1984" y="3200" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="174"/> - <property name="dest_tile_y" value="86"/> + <property name="dest_x" value="174"/> + <property name="dest_y" value="86"/> </properties> </object> <object id="26" name="To Northern Mine" type="warp" x="2176" y="3104" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="102"/> - <property name="dest_tile_y" value="70"/> + <property name="dest_x" value="102"/> + <property name="dest_y" value="70"/> </properties> </object> <object id="27" name="To Hurnscald Cave" type="warp" x="5120" y="3296" width="32" height="32"> <properties> <property name="dest_map" value="009-3"/> - <property name="dest_tile_x" value="117"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="117"/> + <property name="dest_y" value="20"/> </properties> </object> <object id="28" name="CaveSnake" type="spawn" x="640" y="2016" width="544" height="1696"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="19"/> </properties> </object> <object id="29" name="FireSkull" type="spawn" x="1920" y="672" width="96" height="96"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="21"/> </properties> </object> <object id="30" name="PoisonSkull" type="spawn" x="2560" y="672" width="96" height="96"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="22"/> </properties> </object> <object id="31" name="BlackScorpion" type="spawn" x="3392" y="640" width="224" height="736"> <properties> - <property name="eA_death" value="25000"/> - <property name="eA_spawn" value="50000"/> + <property name="death" value="25000"/> + <property name="spawn" value="50000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="7"/> </properties> </object> <object id="32" name="Spider" type="spawn" x="3392" y="2080" width="896" height="1248"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="40000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="10"/> </properties> </object> <object id="33" name="Spider" type="spawn" x="5568" y="640" width="192" height="224"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="40000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="10"/> </properties> </object> <object id="34" name="FireSkull" type="spawn" x="2592" y="2368" width="96" height="96"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="180000"/> + <property name="death" value="60000"/> + <property name="spawn" value="180000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="21"/> </properties> </object> <object id="35" name="PoisonSkull" type="spawn" x="4512" y="1152" width="96" height="96"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="180000"/> + <property name="death" value="60000"/> + <property name="spawn" value="180000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="22"/> </properties> </object> <object id="36" name="BlackScorpion" type="spawn" x="2208" y="4032" width="704" height="544"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="7"/> </properties> </object> <object id="37" name="BlackScorpion" type="spawn" x="1664" y="5152" width="1248" height="576"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="7"/> </properties> </object> <object id="38" name="BlackScorpion" type="spawn" x="1920" y="2400" width="320" height="704"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="7"/> </properties> </object> <object id="39" name="BlackScorpion" type="spawn" x="2560" y="2624" width="128" height="672"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="7"/> </properties> </object> <object id="40" name="Snake" type="spawn" x="4704" y="2112" width="1088" height="1216"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="50000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="30"/> <property name="monster_id" value="8"/> </properties> </object> <object id="41" name="Spider" type="spawn" x="4672" y="2144" width="1088" height="1216"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="50000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="30"/> <property name="monster_id" value="10"/> </properties> </object> <object id="42" name="BlackScorpion" type="spawn" x="5216" y="2080" width="608" height="832"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="50000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="7"/> </properties> </object> <object id="43" name="RedSlime" type="spawn" x="4320" y="928" width="672" height="512"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="25"/> <property name="monster_id" value="6"/> </properties> </object> <object id="44" name="Snake" type="spawn" x="4992" y="1024" width="768" height="384"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="40000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="8"/> </properties> </object> <object id="45" name="BlackScorpion" type="spawn" x="5024" y="640" width="544" height="384"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="40000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="7"/> </properties> </object> <object id="46" name="Snake" type="spawn" x="2240" y="1216" width="96" height="128"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="20000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="8"/> </properties> </object> <object id="47" name="YellowSlime" type="spawn" x="5056" y="3200" width="128" height="192"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="5"/> </properties> </object> <object id="48" name="Maggot" type="spawn" x="2112" y="672" width="96" height="96"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="20000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="0"/> </properties> </object> <object id="49" name="Maggot" type="spawn" x="2368" y="672" width="96" height="96"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="20000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="0"/> </properties> </object> <object id="50" name="BlackScorpion" type="spawn" x="2336" y="1184" width="256" height="160"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="20000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="7"/> </properties> </object> <object id="51" name="RedSlime" type="spawn" x="1984" y="1184" width="256" height="160"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="20000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="6"/> </properties> @@ -1443,32 +1443,32 @@ <object id="70" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2400" y="1536" width="32" height="32"/> <object id="71" name="PoisonSkull" type="spawn" x="1952" y="1056" width="96" height="64"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="22"/> </properties> </object> <object id="72" name="FireSkull" type="spawn" x="2528" y="1056" width="96" height="64"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="21"/> </properties> </object> <object id="73" name="PoisonSkull" type="spawn" x="2368" y="1472" width="96" height="32"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="22"/> </properties> </object> <object id="74" name="FireSkull" type="spawn" x="2112" y="1472" width="96" height="32"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="21"/> </properties> diff --git a/maps/014-1.tmx b/maps/014-1.tmx index bd50ee9f..f46a5510 100644 --- a/maps/014-1.tmx +++ b/maps/014-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="140" height="120" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="24"> <properties> <property name="minimap" value="graphics/minimaps/014-1.png"/> <property name="music" value="mystique-forest.ogg"/> @@ -15,7 +15,7 @@ <tileset firstgid="291" source="../tilesets/woodland_x3.tsx"/> <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> <tileset firstgid="579" source="../tilesets/woodland_water.tsx"/> - <layer name="Ground1" width="140" height="120"> + <layer id="1" name="Ground1" width="140" height="120"> <data encoding="csv"> 3,51,35,19,19,19,19,19,19,19,19,19,19,19,51,35,19,3,3,3,3,19,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,143,90,3,3,181,197,251,3,3,3,3,3,3,3,3,181,182,183,183,183,184,185,3,3,3,3,3,3,3,3,3,3,3,101,86,86,86,86,87,3,3,3,3,3,3,3,3,181,197,214,215,244,3,3,3,3,3,3,3,181,182,214,244,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,88,89,41,125,3,3, 3,51,35,19,3,183,183,183,184,185,3,3,3,3,35,19,19,51,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,159,162,3,181,197,251,3,3,3,3,3,251,3,3,181,197,213,214,215,215,216,201,185,3,3,3,3,3,3,3,3,3,3,3,84,86,86,86,87,3,3,3,3,3,3,3,196,197,251,3,3,3,3,3,3,3,3,3,181,197,229,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,88,89,89,41,125,3, @@ -139,7 +139,7 @@ 19,19,19,19,69,86,83,103,19,19,19,35,69,100,83,103,35,35,35,35,101,84,87,35,35,19,19,19,19,19,19,85,86,102,102,102,103,19,19,19,35,85,86,83,102,103,19,19,19,19,19,101,103,19,19,19,19,19,19,85,86,86,87,19,19,19,19,19,19,19,19,101,84,87,19,19,19,19,19,19,19,19,51,51,51,51,51,51,19,19,19,19,19,19,19,85,86,83,102,103,181,3,19,218,183,212,19,122,40,89,89,89,140,178,3,3,196,197,214,215,216,201,185,19,181,197,251,3,3,3,3,3,108,109,110,3,3,3,185,3 </data> </layer> - <layer name="Fringe" width="140" height="120"> + <layer id="2" name="Fringe" width="140" height="120"> <data encoding="csv"> 0,0,0,0,0,31,0,0,0,15,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,0,268,0,0,187,0,85,86,86,86,83,103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,59,60,0,0,0,0,0,0,0,0,0,0, 0,293,294,181,182,0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,0,187,0,85,86,86,86,87,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -263,7 +263,7 @@ 0,0,0,0,291,292,0,0,0,0,291,292,0,0,291,292,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,179,118,0,0,0,0,0,219,39,0,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0,0,0,293,294,0,0,20,0,180,187,0,0,0,0,0,0,211,0,0 </data> </layer> - <layer name="Over1" width="140" height="120"> + <layer id="3" name="Over1" width="140" height="120"> <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,166,170,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -387,7 +387,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,230,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Collision" width="140" height="120"> + <layer id="4" name="Collision" width="140" height="120"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -511,148 +511,148 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="3004" y="751"/> - <object name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="1662" y="108"/> - <object name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="1884" y="365"/> - <object name="graphics/particles/hillunderfall.particle.xml" type="particle_effect" x="2249" y="617"/> - <object name="To Woodland" type="warp" x="3488" y="2880" width="32" height="96"> + <objectgroup id="5" name="Objects" visible="0"> + <object id="1" name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="3004" y="751"/> + <object id="2" name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="1662" y="108"/> + <object id="3" name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="1884" y="365"/> + <object id="4" name="graphics/particles/hillunderfall.particle.xml" type="particle_effect" x="2249" y="617"/> + <object id="5" name="To Woodland" type="warp" x="3488" y="2880" width="32" height="96"> <properties> <property name="dest_map" value="011-1"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="61"/> </properties> </object> - <object name="To Woodland Cave" type="warp" x="2976" y="1856" width="32" height="32"> + <object id="6" name="To Woodland Cave" type="warp" x="2976" y="1856" width="32" height="32"> <properties> <property name="dest_map" value="014-3"/> - <property name="dest_tile_x" value="57"/> - <property name="dest_tile_y" value="172"/> + <property name="dest_x" value="57"/> + <property name="dest_y" value="172"/> </properties> </object> - <object name="To Woodland Cave" type="warp" x="2432" y="1216" width="32" height="32"> + <object id="7" name="To Woodland Cave" type="warp" x="2432" y="1216" width="32" height="32"> <properties> <property name="dest_map" value="014-3"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="33"/> </properties> </object> - <object name="EvilMushroom" type="spawn" x="0" y="0"> + <object id="8" name="EvilMushroom" type="spawn" x="0" y="0"> <properties> <property name="max_beings" value="20"/> <property name="monster_id" value="11"/> </properties> </object> - <object name="PinkFlower" type="spawn" x="0" y="0"> + <object id="9" name="PinkFlower" type="spawn" x="0" y="0"> <properties> <property name="max_beings" value="25"/> <property name="monster_id" value="12"/> </properties> </object> - <object name="SpikyMushroom" type="spawn" x="0" y="0"> + <object id="10" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> <property name="max_beings" value="15"/> <property name="monster_id" value="17"/> </properties> </object> - <object name="Mouboo" type="spawn" x="0" y="0"> + <object id="11" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> + <property name="death" value="10"/> <property name="max_beings" value="5"/> <property name="monster_id" value="26"/> </properties> </object> - <object name="MauvePlant" type="spawn" x="0" y="0"> + <object id="12" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180"/> - <property name="eA_spawn" value="270"/> + <property name="death" value="180"/> + <property name="spawn" value="270"/> <property name="max_beings" value="1"/> <property name="monster_id" value="27"/> </properties> </object> - <object name="MauvePlant" type="spawn" x="0" y="0"> + <object id="13" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="27"/> </properties> </object> - <object name="CobaltPlant" type="spawn" x="0" y="0"> + <object id="14" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180"/> - <property name="eA_spawn" value="270"/> + <property name="death" value="180"/> + <property name="spawn" value="270"/> <property name="max_beings" value="1"/> <property name="monster_id" value="28"/> </properties> </object> - <object name="CobaltPlant" type="spawn" x="0" y="0"> + <object id="15" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="28"/> </properties> </object> - <object name="GambogePlant" type="spawn" x="0" y="0"> + <object id="16" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180"/> - <property name="eA_spawn" value="270"/> + <property name="death" value="180"/> + <property name="spawn" value="270"/> <property name="max_beings" value="1"/> <property name="monster_id" value="29"/> </properties> </object> - <object name="GambogePlant" type="spawn" x="0" y="0"> + <object id="17" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="29"/> </properties> </object> - <object name="AlizarinPlant" type="spawn" x="0" y="0"> + <object id="18" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180"/> - <property name="eA_spawn" value="270"/> + <property name="death" value="180"/> + <property name="spawn" value="270"/> <property name="max_beings" value="1"/> <property name="monster_id" value="30"/> </properties> </object> - <object name="AlizarinPlant" type="spawn" x="0" y="0"> + <object id="19" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1800000"/> - <property name="eA_spawn" value="2700000"/> + <property name="death" value="1800000"/> + <property name="spawn" value="2700000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="30"/> </properties> </object> - <object name="Silkworm" type="spawn" x="0" y="0"> + <object id="20" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="3000"/> - <property name="eA_spawn" value="6000"/> + <property name="death" value="3000"/> + <property name="spawn" value="6000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="33"/> </properties> </object> - <object name="CloverPatch" type="spawn" x="0" y="0"> + <object id="21" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> - <object name="Squirrel" type="spawn" x="0" y="0"> + <object id="22" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="25"/> <property name="monster_id" value="36"/> </properties> </object> - <object name="Butterfly" type="spawn" x="0" y="0"> + <object id="23" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> </properties> diff --git a/maps/014-3.tmx b/maps/014-3.tmx index 7462431e..d17266b1 100644 --- a/maps/014-3.tmx +++ b/maps/014-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="140" height="200" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="6"> <properties> <property name="minimap" value="graphics/minimaps/014-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -10,7 +10,7 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/cave.tsx"/> <tileset firstgid="131" source="../tilesets/cave_x2.tsx"/> - <layer name="Ground1" width="140" height="200"> + <layer id="1" name="Ground1" width="140" height="200"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -214,7 +214,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="140" height="200"> + <layer id="2" name="Fringe" width="140" height="200"> <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, @@ -418,7 +418,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 </data> </layer> - <layer name="Over1" width="140" height="200"> + <layer id="3" name="Over1" width="140" height="200"> <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, @@ -622,7 +622,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 </data> </layer> - <layer name="Collision" width="140" height="200"> + <layer id="4" name="Collision" width="140" height="200"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -826,39 +826,39 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Woodland" type="warp" x="1120" y="1024" width="32" height="32"> + <objectgroup id="5" name="Objects" visible="0"> + <object id="1" name="To Woodland" type="warp" x="1120" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="014-1"/> - <property name="dest_tile_x" value="76"/> - <property name="dest_tile_y" value="39"/> + <property name="dest_x" value="76"/> + <property name="dest_y" value="39"/> </properties> </object> - <object name="To Woodland" type="warp" x="1792" y="5536" width="64" height="32"> + <object id="2" name="To Woodland" type="warp" x="1792" y="5536" width="64" height="32"> <properties> <property name="dest_map" value="014-1"/> - <property name="dest_tile_x" value="93"/> - <property name="dest_tile_y" value="59"/> + <property name="dest_x" value="93"/> + <property name="dest_y" value="59"/> </properties> </object> - <object name="To Second Cave" type="warp" x="2912" y="3456" width="32" height="32"> + <object id="3" name="To Second Cave" type="warp" x="2912" y="3456" width="32" height="32"> <properties> <property name="dest_map" value="014-3"/> - <property name="dest_tile_x" value="103"/> - <property name="dest_tile_y" value="53"/> + <property name="dest_x" value="103"/> + <property name="dest_y" value="53"/> </properties> </object> - <object name="To First Cave" type="warp" x="3296" y="1728" width="32" height="32"> + <object id="4" name="To First Cave" type="warp" x="3296" y="1728" width="32" height="32"> <properties> <property name="dest_map" value="014-3"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="109"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="109"/> </properties> </object> - <object name="Bat" type="spawn" x="0" y="0"> + <object id="5" name="Bat" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="50"/> <property name="monster_id" value="15"/> </properties> diff --git a/maps/015-1.tmx b/maps/015-1.tmx index 68931cd8..a8bc15e6 100644 --- a/maps/015-1.tmx +++ b/maps/015-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" nextobjectid="14"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="14"> <properties> <property name="minimap" value="graphics/minimaps/015-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -15,7 +15,7 @@ <tileset firstgid="291" source="../tilesets/woodland_x3.tsx"/> <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> <tileset firstgid="579" source="../tilesets/woodland_x5.tsx"/> - <layer name="Ground1" width="140" height="120"> + <layer id="1" name="Ground1" width="140" height="120"> <data encoding="csv"> 35,3,35,35,19,3,51,3,3,35,19,3,35,35,35,19,51,51,3,51,35,3,51,19,35,19,19,19,35,19,19,35,35,3,51,35,19,19,3,51,35,35,19,35,35,19,3,35,19,19,19,19,51,35,19,51,3,51,3,51,51,3,51,51,51,3,51,3,51,19,19,19,19,51,51,51,19,19,51,3,51,51,51,51,51,85,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,87,19,19,19,19,19,3,3,3,3,3,3,3,3,3,101,102,102,102,102,102,102,102,102,102,102,103,3,3,3,3,3,3,3,3,3,3,3, 3,35,35,19,51,3,51,35,35,3,51,35,19,19,19,51,19,19,3,51,51,3,51,19,19,19,35,19,35,19,51,35,19,3,3,51,51,35,3,51,35,19,35,35,19,51,3,35,19,19,51,3,51,35,19,3,51,51,51,19,19,51,19,19,19,51,19,51,19,35,19,19,35,19,51,19,51,51,19,3,51,51,51,51,51,85,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,87,19,19,19,19,19,3,3,3,3,3,3,122,73,73,73,128,128,129,73,73,128,129,73,73,130,3,3,3,3,3,3,3,3,3,3,3,3, @@ -139,7 +139,7 @@ 3,3,3,35,3,3,3,35,3,3,35,67,67,35,3,3,3,51,35,19,3,51,3,67,19,67,3,51,19,67,35,35,19,35,35,67,35,67,67,35,51,3,19,3,67,35,35,91,93,107,51,35,3,3,51,67,35,3,67,35,51,67,3,35,35,3,19,3,3,3,121,40,89,89,89,140,177,178,67,35,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,51,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3 </data> </layer> - <layer name="Ground2" width="140" height="120"> + <layer id="2" name="Ground2" width="140" height="120"> <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,179,187,0,0,0,32,32,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,180,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,53,4,4,4,4,4,4,4,4,4,0, @@ -263,7 +263,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,37,4,4,4,4,4,4,0,0,0,4,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0 </data> </layer> - <layer name="Fringe" width="140" height="120"> + <layer id="3" name="Fringe" width="140" height="120"> <data encoding="csv"> 292,0,0,0,0,291,292,0,0,0,0,0,291,292,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,0,293,294,0,0,0,291,292,0,0,291,292,0,291,292,0,0,0,0,291,292,0,0,293,294,293,294,291,292,0,0,291,292,0,0,0,0,291,292,0,291,292,0,0,291,292,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,293,294,293,294,0,0,0,293,294,0,0,0,0,0,0,293,294,0,0,293,294,291,292,0,293,294,0,0,0,291,292,0,293,294,0,0,0,0,291,292,0,291,292,291,292,291,292,0,0,293,294,291,292,291,292,0,0,0,0,291,292,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -349,7 +349,7 @@ 0,0,0,293,294,0,0,0,291,292,0,291,292,0,0,0,0,0,0,293,294,0,293,294,0,0,0,0,0,0,0,0,291,292,0,291,292,0,0,0,291,292,0,0,291,292,293,294,291,292,0,0,0,0,0,291,292,0,0,293,294,0,293,294,0,291,292,0,291,292,0,0,0,0,0,0,0,291,292,0,0,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268,268,268, 0,0,0,291,292,0,291,292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,293,294,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268,268, 0,0,295,296,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,266,267,0,0,0,0,0,0,0,0,0,291,292,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,293,294,293,294,0,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,293,294,291,292,0,0,0,0,0,291,292,0,0,0,0,291,292,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268,268, -292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,291,292,0,0,0,291,292,266,267,0,0,0,0,293,294,0,293,294,293,294,0,0,291,292,0,293,294,0,0,291,292,266,267,0,0,0,0,0,0,0,0,0,0,0,266,267,0,263,0,0,293,294,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,291,292,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268, +292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,291,292,0,0,0,291,292,266,267,0,0,0,0,293,294,0,293,294,293,294,0,0,291,292,0,293,294,259,260,291,292,266,267,0,0,0,0,0,0,0,0,0,0,0,266,267,0,263,0,0,293,294,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,291,292,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268,268,268, 0,293,294,0,291,292,0,293,294,291,292,293,294,291,292,0,0,293,294,0,0,293,294,267,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,263,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,291,292,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268, 0,293,294,0,0,0,0,0,0,0,0,293,294,0,0,293,294,0,0,293,294,0,291,292,0,0,0,0,0,293,294,291,292,0,0,0,0,0,291,292,293,294,0,293,294,0,0,0,293,294,0,0,0,291,292,293,294,0,293,294,0,0,293,294,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268, 293,294,291,292,293,294,0,293,294,0,0,291,292,293,294,293,294,0,0,291,292,0,293,294,0,0,0,0,0,0,293,294,293,294,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,291,292,291,292,0,0,0,0,293,294,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,268, @@ -387,7 +387,7 @@ 584,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,0,293,294,291,292,582,583,584,0,0,293,294,0,293,294,0,0,291,292,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,579,580,581,0,291,292,582,583,584,0,293,294,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,293,294,291,292,0,0,291,292,291,292,293,294,293,294,291,292,293,294,291,292,293,294,291,292,291,292,293,294,0,293,294,291,292,293,294,293,294,293,294,293,294,0,0,293,294,0,293,294,0,0,0,0,0,0 </data> </layer> - <layer name="Over1" width="140" height="120"> + <layer id="4" name="Over1" width="140" height="120"> <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,6,7,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,22,23,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -511,7 +511,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 </data> </layer> - <layer name="Collision" width="140" height="120"> + <layer id="5" name="Collision" width="140" height="120" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -635,25 +635,25 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="6" name="Objects" visible="0"> <object id="1" name="To Woodland" type="warp" x="2976" y="1728" width="32" height="64"> <properties> <property name="dest_map" value="010-1"/> - <property name="dest_tile_x" value="14"/> - <property name="dest_tile_y" value="54"/> + <property name="dest_x" value="14"/> + <property name="dest_y" value="54"/> </properties> </object> <object id="2" name="To Cat's Cave" type="warp" x="1888" y="992" width="32" height="32"> <properties> <property name="dest_map" value="015-3"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="42"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="42"/> </properties> </object> <object id="3" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="1000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> @@ -661,78 +661,78 @@ <object id="4" name="To Woodland Swamp" type="warp" x="1824" y="3232" width="128" height="32"> <properties> <property name="dest_map" value="025-1"/> - <property name="dest_tile_x" value="89"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="89"/> + <property name="dest_y" value="20"/> </properties> </object> <object id="5" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> </properties> </object> <object id="6" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> - <property name="eA_spawn" value="20"/> + <property name="death" value="10"/> + <property name="spawn" value="20"/> <property name="max_beings" value="30"/> <property name="monster_id" value="36"/> </properties> </object> <object id="7" name="LogHead" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="40"/> <property name="monster_id" value="23"/> </properties> </object> <object id="8" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="20"/> <property name="monster_id" value="17"/> </properties> </object> <object id="9" name="PinkFlower" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="20"/> <property name="monster_id" value="12"/> </properties> </object> <object id="10" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="29"/> </properties> </object> <object id="11" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="30"/> </properties> </object> <object id="12" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="7000"/> - <property name="eA_spawn" value="15000"/> + <property name="death" value="7000"/> + <property name="spawn" value="15000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="33"/> </properties> </object> <object id="13" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="270000"/> + <property name="death" value="180000"/> + <property name="spawn" value="270000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="27"/> </properties> diff --git a/maps/015-3.tmx b/maps/015-3.tmx index e101d8a9..f8d59cc9 100644 --- a/maps/015-3.tmx +++ b/maps/015-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="64" height="64" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="6"> <properties> <property name="name" value="Cat's Cave"/> </properties> @@ -9,7 +9,7 @@ <tileset firstgid="147" source="../tilesets/cave_bilevel.tsx"/> <tileset firstgid="403" source="../tilesets/woodland_ground.tsx"/> <tileset firstgid="659" source="../tilesets/woodland_indoor.tsx"/> - <layer name="Ground1" width="64" height="64"> + <layer id="1" name="Ground1" width="64" height="64"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -77,7 +77,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="64" height="64"> + <layer id="2" name="Fringe" width="64" height="64"> <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, @@ -145,7 +145,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 </data> </layer> - <layer name="Over1" width="64" height="64"> + <layer id="3" name="Over1" width="64" height="64"> <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, @@ -213,7 +213,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 </data> </layer> - <layer name="Collision" width="64" height="64"> + <layer id="4" name="Collision" width="64" height="64"> <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, @@ -281,42 +281,42 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Woodland" type="warp" x="993" y="1376" width="32" height="32"> + <objectgroup id="5" name="Objects" visible="0"> + <object id="1" name="To Woodland" type="warp" x="993" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="015-1"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="32"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="32"/> </properties> </object> - <object name="Bat" type="spawn" x="672" y="736" width="96" height="160"> + <object id="2" name="Bat" type="spawn" x="672" y="736" width="96" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="15"/> </properties> </object> - <object name="Maggot" type="spawn" x="896" y="960" width="96" height="96"> + <object id="3" name="Maggot" type="spawn" x="896" y="960" width="96" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="0"/> </properties> </object> - <object name="Maggot" type="spawn" x="736" y="608" width="64" height="64"> + <object id="4" name="Maggot" type="spawn" x="736" y="608" width="64" height="64"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="0"/> </properties> </object> - <object name="Spider" type="spawn" x="1280" y="608" width="64" height="64"> + <object id="5" name="Spider" type="spawn" x="1280" y="608" width="64" height="64"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="10"/> </properties> diff --git a/maps/016-1.tmx b/maps/016-1.tmx index 4eb5f80a..c0c6ce81 100644 --- a/maps/016-1.tmx +++ b/maps/016-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="13"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="13"> <properties> <property name="minimap" value="graphics/minimaps/016-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -640,14 +640,14 @@ <object id="1" name="To Woodland" type="warp" x="1760" y="576" width="96" height="32"> <properties> <property name="dest_map" value="010-1"/> - <property name="dest_tile_x" value="56"/> - <property name="dest_tile_y" value="104"/> + <property name="dest_x" value="56"/> + <property name="dest_y" value="104"/> </properties> </object> <object id="2" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> @@ -655,70 +655,70 @@ <object id="3" name="To Woodland Swamp" type="warp" x="640" y="1664" width="32" height="96"> <properties> <property name="dest_map" value="025-1"/> - <property name="dest_tile_x" value="129"/> - <property name="dest_tile_y" value="58"/> + <property name="dest_x" value="129"/> + <property name="dest_y" value="58"/> </properties> </object> <object id="4" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> + <property name="spawn" value="30"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> </properties> </object> <object id="5" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> - <property name="eA_spawn" value="20"/> + <property name="death" value="10"/> + <property name="spawn" value="20"/> <property name="max_beings" value="30"/> <property name="monster_id" value="36"/> </properties> </object> <object id="6" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="26"/> </properties> </object> <object id="8" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="3"/> <property name="monster_id" value="27"/> </properties> </object> <object id="9" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="270000"/> + <property name="death" value="180000"/> + <property name="spawn" value="270000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="27"/> </properties> </object> <object id="10" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="3"/> <property name="monster_id" value="28"/> </properties> </object> <object id="11" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="270000"/> + <property name="death" value="180000"/> + <property name="spawn" value="270000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="27"/> </properties> </object> <object id="12" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="7000"/> - <property name="eA_spawn" value="150000"/> + <property name="death" value="7000"/> + <property name="spawn" value="150000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="33"/> </properties> diff --git a/maps/016-2.tmx b/maps/016-2.tmx index 1004e3e2..76f5bbef 100644 --- a/maps/016-2.tmx +++ b/maps/016-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="53" tilewidth="32" tileheight="32" nextobjectid="12"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="53" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="12"> <properties> <property name="Authors" value="Tezer,Gumi"/> <property name="music" value="despair.ogg"/> @@ -10,7 +10,7 @@ <tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/> <tileset firstgid="355" source="../tilesets/pots_x2.tsx"/> - <layer name="Ground1" width="100" height="53"> + <layer id="1" name="Ground1" width="100" height="53"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -67,7 +67,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="100" height="53"> + <layer id="2" name="Ground2" width="100" height="53"> <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, @@ -124,7 +124,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 </data> </layer> - <layer name="Ground3" width="100" height="53"> + <layer id="3" name="Ground3" width="100" height="53"> <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, @@ -181,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,0,0,0,0,0,0,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="100" height="53"> + <layer id="4" name="Fringe" width="100" height="53"> <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, @@ -238,7 +238,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 </data> </layer> - <layer name="Over1" width="100" height="53"> + <layer id="5" name="Over1" width="100" height="53"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -295,7 +295,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Collision" width="100" height="53"> + <layer id="6" name="Collision" width="100" height="53"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -352,19 +352,19 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Outside" type="warp" x="896" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="016-1"/> - <property name="dest_tile_x" value="84"/> - <property name="dest_tile_y" value="54"/> + <property name="dest_x" value="84"/> + <property name="dest_y" value="54"/> </properties> </object> <object id="6" name="To Outside" type="warp" x="832" y="704" width="32" height="32"> <properties> <property name="dest_map" value="016-1"/> - <property name="dest_tile_x" value="84"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="84"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="10" name="graphics/particles/cookingfire.particle.xml" type="particle_effect" x="880" y="928" width="32" height="32"/> diff --git a/maps/017-1.tmx b/maps/017-1.tmx index df05cc3f..63d61cc6 100644 --- a/maps/017-1.tmx +++ b/maps/017-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="220" height="124" tilewidth="32" tileheight="32" nextobjectid="78"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="220" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="79"> <properties> <property name="minimap" value="graphics/minimaps/017-1.png"/> <property name="music" value="mystique-forest.ogg"/> @@ -19,7 +19,7 @@ <tileset firstgid="611" source="../tilesets/snow_village2.tsx"/> <tileset firstgid="867" source="../tilesets/snow.tsx"/> <tileset firstgid="1123" source="../tilesets/snow_tree_x3.tsx"/> - <layer name="Ground1" width="220" height="124"> + <layer id="1" name="Ground1" width="220" height="124"> <data encoding="csv"> 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,89,89,89,89,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,88,90,950,1043,1027,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,1013,950,950,950,950,950,950,950,950,1013,950,950,950,950,950,950,950,950,950,950,1013,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950, 19,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,89,89,89,89,19,19,19,19,43,44,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,137,41,130,950,1043,1027,950,950,950,950,950,950,950,950,950,950,950,950,950,950,1013,950,950,950,950,950,950,950,950,1013,950,950,950,950,950,950,950,950,950,950,1013,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950, @@ -147,7 +147,7 @@ 19,19,243,200,199,199,200,201,185,19,19,19,19,19,19,19,19,19,19,243,218,183,183,183,183,183,183,183,212,251,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,92,94,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,69,100,86,99,71,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,76,78,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19 </data> </layer> - <layer name="Ground2" width="220" height="124"> + <layer id="2" name="Ground2" width="220" height="124"> <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,969,1059,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,952,953,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,953,1059,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -275,7 +275,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,111,48,96,63,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,79,64,96,47,112,112,112,112,48,96,63,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,15,0 </data> </layer> - <layer name="Ground3" width="220" height="124"> + <layer id="3" name="Ground3" width="220" height="124"> <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, @@ -403,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="220" height="124"> + <layer id="4" name="Fringe" width="220" height="124"> <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,187,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,1123,0,0,0,0,0,0,0,0,0,0,0,1123,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1123,0,0,1124,0,1123,0,0,1125,0,1124,0,1124,0,0,0,1124,0,0,1124,0,1124,0,1123,0,1124,0,0,0,0,0,0,1123,0,0,0,0,0,1124,0,0,0,0,0,0,0,0,0,0,0,0,0,1124,0,0,0,0,0,0,0,0,0, 0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1123,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,0,0,0,0,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1123,0,0,0,0,0,0,0,0,1123,0,1123,0,0,0,1123,0,0,1124,0,1123,0,0,0,0,0,0,0,0,0,0,1125,0,1123,0,1124,0,0,1125,0,0,0,0,0,0,0,1123,0,0,0,0,1124,0,0,1123,0,0,0,0,1124,0,0,0,0,1124,0,0, @@ -531,7 +531,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,291,292,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,293,294,0,0,291,292,0,0,0,0,293,294,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,33,0,0,0,0,0,0,0,79,64,96,47,112,112,112,112,48,96,63,81,0,0,293,294,0,293,294,0,293,294,0,0,291,292,0,293,294,0,293,294,0,293,294,0,0,0,0,293,294,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,0,0,291,292,0,291,292,0,0,0,0,0,0,0,0,293,294,0,0,293,294,0,0,0,0 </data> </layer> - <layer name="Over1" width="220" height="124"> + <layer id="5" name="Over1" width="220" height="124"> <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, @@ -659,7 +659,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,212,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,171,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="220" height="124"> + <layer id="6" name="Collision" width="220" height="124" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -787,7 +787,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects" visible="0"> <object id="37" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="1692" y="1099"/> <object id="38" name="graphics/particles/waterfall-2x4.particle.xml" type="particle_effect" x="1693" y="807"/> <object id="39" name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="3788" y="557"/> @@ -796,82 +796,82 @@ <object id="42" name="To Woodland Hills" type="warp" x="1408" y="3360" width="128" height="32"> <properties> <property name="dest_map" value="013-1"/> - <property name="dest_tile_x" value="45"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="45"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="43" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> <object id="44" name="CloverPatch" type="spawn" x="3136" y="960" width="96" height="64"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="150000"/> + <property name="death" value="50000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> + <property name="spawn" value="150000"/> </properties> </object> <object id="45" name="To Theater" type="warp" x="1376" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="017-2"/> - <property name="dest_tile_x" value="26"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="26"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="46" name="GambogePlant" type="spawn" x="640" y="736" width="640" height="416"> <properties> - <property name="eA_death" value="25000"/> + <property name="death" value="25000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="1031"/> </properties> </object> <object id="47" name="LogHead" type="spawn" x="1696" y="672" width="2464" height="288"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="5000"/> + <property name="death" value="60000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1025"/> + <property name="spawn" value="5000"/> </properties> </object> <object id="48" name="LogHead" type="spawn" x="704" y="1344" width="640" height="416"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="5000"/> + <property name="death" value="60000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1025"/> + <property name="spawn" value="5000"/> </properties> </object> <object id="49" name="To Woodland Hills Labyrinth" type="warp" x="2432" y="992" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="69"/> - <property name="dest_tile_y" value="68"/> + <property name="dest_x" value="69"/> + <property name="dest_y" value="68"/> </properties> </object> <object id="50" name="To Woodland Hills Labyrinth" type="warp" x="3136" y="640" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="52"/> </properties> </object> <object id="51" name="To Woodland Hills Labyrinth" type="warp" x="3104" y="992" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="76"/> - <property name="dest_tile_y" value="65"/> + <property name="dest_x" value="76"/> + <property name="dest_y" value="65"/> </properties> </object> <object id="52" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> <property name="max_beings" value="10"/> <property name="monster_id" value="53"/> + <property name="spawn" value="30"/> </properties> </object> <object id="53" name="graphics/particles/apple.particle.xml" type="particle_effect" x="3182" y="1324"/> @@ -881,119 +881,126 @@ <object id="57" name="graphics/particles/apple.particle.xml" type="particle_effect" x="3162" y="1312"/> <object id="58" name="Bat" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> + <property name="spawn" value="0"/> </properties> </object> <object id="59" name="FireGoblin" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="9"/> + <property name="spawn" value="0"/> </properties> </object> <object id="60" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="26"/> + <property name="spawn" value="0"/> </properties> </object> <object id="61" name="PinkFlower" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="12"/> + <property name="spawn" value="0"/> </properties> </object> <object id="62" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="17"/> + <property name="spawn" value="0"/> </properties> </object> <object id="63" name="EvilMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="10"/> <property name="monster_id" value="11"/> + <property name="spawn" value="0"/> </properties> </object> <object id="64" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="3"/> <property name="monster_id" value="30"/> + <property name="spawn" value="0"/> </properties> </object> <object id="65" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="3"/> <property name="monster_id" value="29"/> + <property name="spawn" value="0"/> </properties> </object> <object id="66" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="3"/> <property name="monster_id" value="28"/> + <property name="spawn" value="0"/> </properties> </object> <object id="67" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="5"/> <property name="monster_id" value="27"/> + <property name="spawn" value="0"/> </properties> </object> <object id="68" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> <property name="max_beings" value="10"/> <property name="monster_id" value="33"/> + <property name="spawn" value="0"/> </properties> </object> <object id="69" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="10"/> - <property name="eA_spawn" value="20"/> + <property name="death" value="10"/> <property name="max_beings" value="30"/> <property name="monster_id" value="36"/> + <property name="spawn" value="20"/> </properties> </object> <object id="71" name="To Mirak's House" type="warp" x="5376" y="2880" width="32" height="32"> <properties> <property name="dest_map" value="056-2"/> - <property name="dest_tile_x" value="34"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="34"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="72" name="To Woodland Hills" type="warp" x="6016" y="3328" width="32" height="32"> <properties> <property name="dest_map" value="055-1"/> - <property name="dest_tile_x" value="74"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="74"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="77" name="To Deep Snow Forest" type="warp" x="5792" y="512" width="96" height="32"> <properties> <property name="dest_map" value="045-1"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="178"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="178"/> + </properties> + </object> + <object id="78" name="PinkFlower" type="spawn" x="640" y="736" width="256" height="288"> + <properties> + <property name="death" value="250"/> + <property name="max_beings" value="2"/> + <property name="monster_id" value="12"/> </properties> </object> </objectgroup> diff --git a/maps/017-2.tmx b/maps/017-2.tmx index b05eb7b2..58d4d464 100644 --- a/maps/017-2.tmx +++ b/maps/017-2.tmx @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="53" height="51" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="53" height="51" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="3"> <properties> <property name="name" value="Theater"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/> - <layer name="Ground1" width="53" height="51"> + <layer id="1" name="Ground1" width="53" height="51"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -60,7 +60,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="53" height="51"> + <layer id="2" name="Ground2" width="53" height="51"> <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, @@ -115,7 +115,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 </data> </layer> - <layer name="Ground3" width="53" height="51"> + <layer id="3" name="Ground3" width="53" height="51"> <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, @@ -170,7 +170,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 </data> </layer> - <layer name="Fringe" width="53" height="51"> + <layer id="4" name="Fringe" width="53" height="51"> <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, @@ -225,7 +225,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 </data> </layer> - <layer name="Over1" width="53" height="51"> + <layer id="5" name="Over1" width="53" height="51"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -280,7 +280,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Collision" width="53" height="51"> + <layer id="6" name="Collision" width="53" height="51"> <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, @@ -303,7 +303,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,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,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,0,2,0,0,0,0,0,0,0,0,0,2,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,0,2,0,0,0,0,0,0,0,0,0,2,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,0,2,0,0,0,0,0,0,0,0,0,2,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,0,2,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -335,19 +335,19 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> - <object name="To Outside" type="warp" x="832" y="992" width="32" height="32"> + <objectgroup id="7" name="Objects"> + <object id="1" name="To Outside" type="warp" x="832" y="992" width="32" height="32"> <properties> <property name="dest_map" value="017-1"/> - <property name="dest_tile_x" value="43"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="43"/> + <property name="dest_y" value="33"/> </properties> </object> - <object name="To Center Trapdoor Backstage" type="warp" x="832" y="672" width="32" height="32"> + <object id="2" name="To Center Trapdoor Backstage" type="warp" x="832" y="672" width="32" height="32"> <properties> <property name="dest_map" value="017-9"/> - <property name="dest_tile_x" value="26"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="26"/> + <property name="dest_y" value="27"/> </properties> </object> </objectgroup> diff --git a/maps/017-3.tmx b/maps/017-3.tmx index 13d27c82..a6220fc8 100644 --- a/maps/017-3.tmx +++ b/maps/017-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="110" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="10"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="110" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="10"> <properties> <property name="minimap" value="graphics/minimaps/017-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -537,64 +537,64 @@ <object id="1" name="To Woodland Hills" type="warp" x="2208" y="2208" width="32" height="32"> <properties> <property name="dest_map" value="017-1"/> - <property name="dest_tile_x" value="76"/> - <property name="dest_tile_y" value="32"/> + <property name="dest_x" value="76"/> + <property name="dest_y" value="32"/> </properties> </object> <object id="2" name="To Theater Hill" type="warp" x="2656" y="1696" width="32" height="32"> <properties> <property name="dest_map" value="017-1"/> - <property name="dest_tile_x" value="98"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="98"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="3" name="To Woodland Hills Labyrinth" type="warp" x="2432" y="2048" width="32" height="32"> <properties> <property name="dest_map" value="017-1"/> - <property name="dest_tile_x" value="98"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="98"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="4" name="To Deeper Labyrinth" type="warp" x="2016" y="832" width="32" height="32"> <properties> <property name="dest_map" value="017-4"/> - <property name="dest_tile_x" value="52"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="52"/> + <property name="dest_y" value="24"/> </properties> </object> <object id="5" name="To Deeper Labyrinth" type="warp" x="928" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="017-4"/> - <property name="dest_tile_x" value="30"/> - <property name="dest_tile_y" value="48"/> + <property name="dest_x" value="30"/> + <property name="dest_y" value="48"/> </properties> </object> <object id="6" name="To Deeper Labyrinth" type="warp" x="2208" y="1664" width="32" height="32"> <properties> <property name="dest_map" value="017-4"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="7" name="To Deeper Labyrinth" type="warp" x="1856" y="1920" width="32" height="32"> <properties> <property name="dest_map" value="017-4"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="40"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="40"/> </properties> </object> <object id="8" name="To Deeper Labyrinth" type="warp" x="992" y="2240" width="64" height="32"> <properties> <property name="dest_map" value="017-4"/> - <property name="dest_tile_x" value="123"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="123"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="9" name="To Deeper Cave" type="warp" x="2592" y="2464" width="96" height="32"> <properties> <property name="dest_map" value="017-4"/> - <property name="dest_tile_x" value="166"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="166"/> + <property name="dest_y" value="27"/> </properties> </object> </objectgroup> diff --git a/maps/017-4.tmx b/maps/017-4.tmx index 7c55c57e..a1a4bf36 100644 --- a/maps/017-4.tmx +++ b/maps/017-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="250" height="75" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="250" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="15"> <properties> <property name="minimap" value="graphics/minimaps/017-4.png"/> <property name="music" value="cavesong.ogg"/> @@ -12,8 +12,8 @@ <tileset firstgid="403" source="../tilesets/woodland_ground.tsx"/> <tileset firstgid="659" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="915" source="../tilesets/woodland_indoor_x2.tsx"/> - <tileset firstgid="947" source="../tilesets/woodland_indoor_x3.tsx"/> - <layer name="Ground1" width="250" height="75"> + <tileset firstgid="963" source="../tilesets/woodland_indoor_x3.tsx"/> + <layer id="1" name="Ground1" width="250" height="75"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -92,7 +92,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="250" height="75"> + <layer id="2" name="Ground2" width="250" height="75"> <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, @@ -171,7 +171,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 </data> </layer> - <layer name="Fringe" width="250" height="75"> + <layer id="3" name="Fringe" width="250" height="75"> <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, @@ -199,11 +199,11 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,136,137,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,953,954,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,136,137,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,969,970,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,951,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,915,916,0,0,0,0,950,952,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,967,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,915,916,0,0,0,0,966,968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,917,918,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -250,7 +250,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 </data> </layer> - <layer name="Over1" width="250" height="75"> + <layer id="4" name="Over1" width="250" height="75"> <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, @@ -329,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="250" height="75"> + <layer id="5" name="Collision" width="250" height="75"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -408,62 +408,62 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Labyrinth" type="warp" x="6432" y="800" width="32" height="32"> + <objectgroup id="6" name="Objects" visible="0"> + <object id="1" name="To Labyrinth" type="warp" x="6432" y="800" width="32" height="32"> <properties> <property name="dest_map" value="017-4"/> - <property name="dest_tile_x" value="173"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="173"/> + <property name="dest_y" value="46"/> </properties> </object> - <object name="To Cave" type="warp" x="2912" y="832" width="32" height="32"> + <object id="2" name="To Cave" type="warp" x="2912" y="832" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="69"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="69"/> + <property name="dest_y" value="51"/> </properties> </object> - <object name="To Cave" type="warp" x="3936" y="832" width="32" height="32"> + <object id="3" name="To Cave" type="warp" x="3936" y="832" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="32"/> - <property name="dest_tile_y" value="69"/> + <property name="dest_x" value="32"/> + <property name="dest_y" value="69"/> </properties> </object> - <object name="To Cave" type="warp" x="5312" y="832" width="32" height="32"> + <object id="4" name="To Cave" type="warp" x="5312" y="832" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="82"/> - <property name="dest_tile_y" value="76"/> + <property name="dest_x" value="82"/> + <property name="dest_y" value="76"/> </properties> </object> - <object name="To Cave" type="warp" x="960" y="1504" width="32" height="32"> + <object id="5" name="To Cave" type="warp" x="960" y="1504" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="47"/> </properties> </object> - <object name="To Cave" type="warp" x="1664" y="800" width="32" height="32"> + <object id="6" name="To Cave" type="warp" x="1664" y="800" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="63"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="63"/> + <property name="dest_y" value="27"/> </properties> </object> - <object name="To Cave" type="warp" x="2656" y="1312" width="32" height="32"> + <object id="7" name="To Cave" type="warp" x="2656" y="1312" width="32" height="32"> <properties> <property name="dest_map" value="017-3"/> - <property name="dest_tile_x" value="58"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="58"/> + <property name="dest_y" value="61"/> </properties> </object> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="928" y="1568" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1696" y="768" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2624" y="1280" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2944" y="896" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3904" y="896" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="5344" y="896" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="5568" y="1440" width="32" height="32"/> + <object id="8" name="graphics/particles/flame.particle.xml" type="particle_effect" x="928" y="1568" width="32" height="32"/> + <object id="9" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1696" y="768" width="32" height="32"/> + <object id="10" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2624" y="1280" width="32" height="32"/> + <object id="11" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2944" y="896" width="32" height="32"/> + <object id="12" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3904" y="896" width="32" height="32"/> + <object id="13" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5344" y="896" width="32" height="32"/> + <object id="14" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5568" y="1440" width="32" height="32"/> </objectgroup> </map> diff --git a/maps/017-9.tmx b/maps/017-9.tmx index be9ad388..88fb846b 100644 --- a/maps/017-9.tmx +++ b/maps/017-9.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="53" height="51" tilewidth="32" tileheight="32" nextobjectid="9"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="53" height="51" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="9"> <properties> <property name="name" value="GM Lounge"/> </properties> @@ -7,7 +7,7 @@ <tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="259" source="../tilesets/woodland_indoor_x3.tsx"/> <tileset firstgid="307" source="../tilesets/pots_x2.tsx"/> - <layer name="Ground1" width="53" height="51"> + <layer id="1" name="Ground1" width="53" height="51"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -62,7 +62,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="53" height="51"> + <layer id="2" name="Ground2" width="53" height="51"> <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, @@ -117,7 +117,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 </data> </layer> - <layer name="Ground3" width="53" height="51"> + <layer id="3" name="Ground3" width="53" height="51"> <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, @@ -172,7 +172,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 </data> </layer> - <layer name="Fringe" width="53" height="51"> + <layer id="4" name="Fringe" width="53" height="51"> <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, @@ -227,7 +227,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 </data> </layer> - <layer name="Over1" width="53" height="51"> + <layer id="5" name="Over1" width="53" height="51"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -282,7 +282,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Collision" width="53" height="51" visible="0"> + <layer id="6" name="Collision" width="53" height="51" 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, @@ -337,40 +337,40 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Nivalis" type="warp" x="928" y="640" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="2" name="To Hurnscald" type="warp" x="832" y="672" width="32" height="32"> <properties> <property name="dest_map" value="009-1"/> - <property name="dest_tile_x" value="43"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="43"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="3" name="To Tumlishar" type="warp" x="672" y="640" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="54"/> - <property name="dest_tile_y" value="118"/> + <property name="dest_x" value="54"/> + <property name="dest_y" value="118"/> </properties> </object> <object id="5" name="To Crypt" type="warp" x="992" y="640" width="32" height="32"> <properties> <property name="dest_map" value="027-2"/> - <property name="dest_tile_x" value="46"/> - <property name="dest_tile_y" value="110"/> + <property name="dest_x" value="46"/> + <property name="dest_y" value="110"/> </properties> </object> <object id="6" name="To Candor" type="warp" x="736" y="640" width="32" height="32"> <properties> <property name="dest_map" value="029-1"/> - <property name="dest_tile_x" value="34"/> - <property name="dest_tile_y" value="95"/> + <property name="dest_x" value="34"/> + <property name="dest_y" value="95"/> </properties> </object> <object id="8" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="704" y="832" width="32" height="32"/> diff --git a/maps/018-1.tmx b/maps/018-1.tmx index fe66ccaf..da99bd6e 100644 --- a/maps/018-1.tmx +++ b/maps/018-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="47"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="48"> <properties> <property name="minimap" value="graphics/minimaps/018-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -21,6 +21,8 @@ <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> <tileset firstgid="579" source="../tilesets/woodland_village_x2.tsx"/> <tileset firstgid="595" source="../tilesets/woodland_indoor.tsx"/> + <tileset firstgid="851" source="../tilesets/woodland_x3_to_1x.tsx"/> + <tileset firstgid="947" source="../tilesets/woodland_village_x2_to_1x.tsx"/> <layer id="1" name="Ground1" width="200" height="120"> <data encoding="csv"> 19,19,19,19,19,19,19,181,150,123,89,41,73,123,89,89,89,89,89,89,19,19,19,19,19,19,19,19,19,19,19,19,89,89,41,129,73,73,73,128,73,125,19,19,19,72,73,73,123,89,89,89,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,19,213,147,123,89,41,73,123,57,105,105,106,19,19,138,56,90,69,71,19,19,19,85,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,59,60,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,59,60,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,88,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, @@ -266,7 +268,7 @@ 540,0,0,20,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,558,0,20,578,576,576,546,576,576,546,576,576,546,576,576,546,576,576,576,577,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 556,0,0,20,0,0,0,560,576,576,576,576,576,576,576,576,576,169,167,167,167,167,167,167,167,167,167,167,167,167,0,0,0,0,559,0,0,0,0,0,0,0,245,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,542,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,20,0,0,0,0,0,0,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,384,0,0,0,95,96,96,66,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,36,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,54,0,559,0,0,0,0,0,0,0,0,0,0,0,559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -4,4,4,54,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,194,0,249,0,0,0,20,0,0,0,0,0,0,18,18,17,0,0,0,0,0,0,0,0,0,0,384,0,0,0,384,0,95,96,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,561,576,576,546,576,576,562,0,0,0,578,576,576,546,576,576,545,0,20,0,559,0,0,0,0,0,0,0,0,0,0,0,559,0,0,33,34,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +4,4,4,54,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,194,0,249,0,0,0,20,0,0,0,0,0,0,18,18,17,0,0,0,0,0,0,0,0,0,0,384,0,0,0,384,0,95,96,96,97,950,951,951,951,951,951,951,951,951,951,951,951,951,951,951,952,20,561,576,576,546,576,576,562,0,0,0,578,576,576,546,576,576,545,0,20,0,559,0,0,0,0,0,0,0,0,0,0,0,559,0,0,33,34,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Fringe" width="200" height="120"> @@ -513,8 +515,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,0,0,0,0,230,0,0,0,0,0,0,0,0,0,0,0,0,0,167,167,167,167,167,167,167,167,167,165,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,232,0,0,0,0,0,0,0,0,0,0,0,851,852,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,855,856,0,0,0,0,0,0,0,0,0,0,0,855,856,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,248,232,0,0,0,0,0,0,0,0,0,0,867,868,0,0,0,0,0,0,950,951,951,951,951,951,951,951,951,952,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,871,872,0,855,856,0,0,0,0,0,855,856,0,871,872,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Over2" width="200" height="120"> @@ -641,7 +643,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 </data> </layer> - <layer id="6" name="Collision" width="200" height="120"> + <layer id="6" name="Collision" width="200" height="120" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -769,336 +771,343 @@ <object id="1" name="To Northern Mine" type="warp" x="2496" y="1888" width="64" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="100"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="100"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="2" name="To Bat Cave" type="warp" x="3584" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="38"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="38"/> </properties> </object> <object id="3" name="To Woodland Hills Cave" type="warp" x="3680" y="1280" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="22"/> - <property name="dest_tile_y" value="114"/> + <property name="dest_x" value="22"/> + <property name="dest_y" value="114"/> </properties> </object> <object id="4" name="To Northern Mine" type="warp" x="4096" y="1792" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="99"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="99"/> </properties> </object> <object id="5" name="To Northern Mine" type="warp" x="2880" y="1344" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="123"/> - <property name="dest_tile_y" value="166"/> + <property name="dest_x" value="123"/> + <property name="dest_y" value="166"/> </properties> </object> <object id="6" name="To Northern Mine" type="warp" x="2208" y="1728" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="70"/> - <property name="dest_tile_y" value="105"/> + <property name="dest_x" value="70"/> + <property name="dest_y" value="105"/> </properties> </object> <object id="7" name="To Woodland Hills Cave" type="warp" x="4064" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="139"/> - <property name="dest_tile_y" value="44"/> + <property name="dest_x" value="139"/> + <property name="dest_y" value="44"/> </properties> </object> <object id="8" name="To Woodland Hills Cave" type="warp" x="4289" y="1442" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="61"/> - <property name="dest_tile_y" value="178"/> + <property name="dest_x" value="61"/> + <property name="dest_y" value="178"/> </properties> </object> <object id="9" name="To Woodland Hills Cave" type="warp" x="4704" y="1280" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="81"/> - <property name="dest_tile_y" value="102"/> + <property name="dest_x" value="81"/> + <property name="dest_y" value="102"/> </properties> </object> <object id="10" name="To Northern Mine" type="warp" x="4896" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="145"/> - <property name="dest_tile_y" value="162"/> + <property name="dest_x" value="145"/> + <property name="dest_y" value="162"/> </properties> </object> <object id="11" name="To Northern Mine" type="warp" x="5056" y="1088" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="103"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="103"/> </properties> </object> <object id="12" name="To Northern Mine" type="warp" x="5184" y="1408" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="166"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="166"/> </properties> </object> <object id="13" name="To Jack O Cave" type="warp" x="5664" y="640" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="177"/> - <property name="dest_tile_y" value="90"/> + <property name="dest_x" value="177"/> + <property name="dest_y" value="90"/> </properties> </object> <object id="14" name="To Woodland Mining Camp Indoor" type="warp" x="2080" y="2336" width="32" height="32"> <properties> <property name="dest_map" value="018-2"/> - <property name="dest_tile_x" value="50"/> - <property name="dest_tile_y" value="28"/> + <property name="dest_x" value="50"/> + <property name="dest_y" value="28"/> </properties> </object> <object id="15" name="SeaSlime" type="spawn" x="4224" y="1888" width="320" height="1344"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="31"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="16" name="ManaBug" type="spawn" x="2624" y="2400" width="1728" height="832"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="1131"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="17" name="SeaSlime" type="spawn" x="3616" y="1312" width="224" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="31"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="18" name="PinkFlower" type="spawn" x="3616" y="1696" width="448" height="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="12"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="19" name="JackO" type="spawn" x="5344" y="608" width="576" height="640"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="180000"/> + <property name="death" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="20"/> + <property name="spawn" value="180000"/> </properties> </object> <object id="20" name="YellowSlime" type="spawn" x="2464" y="1888" width="128" height="64"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="5"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="21" name="Silkworm" type="spawn" x="1600" y="1920" width="480" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="33"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="22" name="Bat" type="spawn" x="896" y="1568" width="1024" height="928"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="15"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="23" name="To Hurnscald Outskirts" type="warp" x="2464" y="3136" width="128" height="32"> <properties> <property name="dest_map" value="008-1"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="18"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="18"/> </properties> </object> <object id="24" name="GrassSnake" type="spawn" x="4000" y="1088" width="608" height="352"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="32"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="25" name="GrassSnake" type="spawn" x="3840" y="1184" width="320" height="384"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="32"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="26" name="GrassSnake" type="spawn" x="3616" y="480" width="736" height="320"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="32"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="27" name="GrassSnake" type="spawn" x="3616" y="800" width="640" height="320"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="32"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="28" name="Bat" type="spawn" x="4608" y="1312" width="352" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="29" name="RedSlime" type="spawn" x="5088" y="1344" width="672" height="352"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="30000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="6"/> + <property name="spawn" value="120000"/> </properties> </object> <object id="30" name="Bat" type="spawn" x="4160" y="1440" width="448" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="15"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="31" name="CloverPatch" type="spawn" x="5120" y="1440" width="448" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="32" name="Silkworm" type="spawn" x="3488" y="1952" width="192" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="33"/> + <property name="spawn" value="60000"/> </properties> </object> <object id="33" name="SeaSlime" type="spawn" x="3680" y="1568" width="160" height="128"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="31"/> + <property name="spawn" value="120000"/> </properties> </object> <object id="34" name="RedSlime" type="spawn" x="2784" y="1344" width="608" height="384"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="6"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="35" name="CobaltPlant" type="spawn" x="3168" y="1568" width="512" height="224"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="240000"/> + <property name="death" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="28"/> + <property name="spawn" value="240000"/> </properties> </object> <object id="36" name="RedSlime" type="spawn" x="1920" y="1664" width="1216" height="224"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="6"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="37" name="RedSlime" type="spawn" x="4480" y="640" width="352" height="320"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="6"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="38" name="Bat" type="spawn" x="1952" y="2592" width="480" height="576"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="15"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="39" name="RedSlime" type="spawn" x="4960" y="704" width="384" height="608"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="6"/> + <property name="spawn" value="100000"/> </properties> </object> <object id="40" name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="3468" y="1290"/> <object id="41" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="1000"/> + <property name="death" value="1000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="35"/> </properties> </object> <object id="42" name="Butterfly" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="20"/> - <property name="eA_spawn" value="30"/> + <property name="death" value="20"/> <property name="max_beings" value="20"/> <property name="monster_id" value="53"/> + <property name="spawn" value="30"/> </properties> </object> <object id="43" name="graphics/particles/bonfire.particle.xml" type="particle_effect" x="2080" y="2528" width="32" height="32"/> <object id="44" name="To Woodland Mining Camp Indoor" type="warp" x="2048" y="2240" width="32" height="32"> <properties> <property name="dest_map" value="018-2"/> - <property name="dest_tile_x" value="41"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="41"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="45" name="To Northern Mine" type="warp" x="2496" y="1088" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="107"/> - <property name="dest_tile_y" value="147"/> + <property name="dest_x" value="107"/> + <property name="dest_y" value="147"/> </properties> </object> <object id="46" name="Maggot" type="spawn" x="4064" y="1952" width="480" height="1280"> <properties> - <property name="eA_spawn" value="30"/> <property name="max_beings" value="15"/> <property name="monster_id" value="1002"/> + <property name="spawn" value="30"/> + </properties> + </object> + <object id="47" name="PinkFlower" type="spawn" x="832" y="2944" width="352" height="256"> + <properties> + <property name="death" value="250"/> + <property name="max_beings" value="2"/> + <property name="monster_id" value="12"/> </properties> </object> </objectgroup> diff --git a/maps/018-2.tmx b/maps/018-2.tmx index 87433b56..0e2f0801 100644 --- a/maps/018-2.tmx +++ b/maps/018-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="146" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="12"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="146" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="12"> <properties> <property name="music" value="magick-real.ogg"/> <property name="name" value="Woodland Mining Camp Indoor"/> @@ -312,56 +312,56 @@ <object id="4" name="To Outside" type="warp" x="1600" y="928" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="65"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="65"/> + <property name="dest_y" value="74"/> </properties> </object> <object id="5" name="To Outside" type="warp" x="1312" y="640" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="69"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="69"/> </properties> </object> <object id="6" name="To Bottom Floor" type="warp" x="640" y="768" width="32" height="32"> <properties> <property name="dest_map" value="018-2"/> - <property name="dest_tile_x" value="112"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="112"/> + <property name="dest_y" value="26"/> </properties> </object> <object id="7" name="To First Floor" type="warp" x="3584" y="800" width="32" height="32"> <properties> <property name="dest_map" value="018-2"/> - <property name="dest_tile_x" value="20"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="20"/> + <property name="dest_y" value="23"/> </properties> </object> <object id="8" name="To Second Floor" type="warp" x="640" y="896" width="64" height="32"> <properties> <property name="dest_map" value="018-2"/> - <property name="dest_tile_x" value="79"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="79"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="9" name="To First Floor" type="warp" x="2496" y="832" width="64" height="32"> <properties> <property name="dest_map" value="018-2"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="29"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="29"/> </properties> </object> <object id="10" name="To Northern Mine" type="warp" x="3648" y="608" width="32" height="32"> <properties> <property name="dest_map" value="018-3"/> - <property name="dest_tile_x" value="177"/> - <property name="dest_tile_y" value="55"/> + <property name="dest_x" value="177"/> + <property name="dest_y" value="55"/> </properties> </object> <object id="11" name="YellowSlime" type="spawn" x="3584" y="640" width="160" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="5"/> </properties> diff --git a/maps/018-3.tmx b/maps/018-3.tmx index cc8fbfa8..edbb9b3b 100644 --- a/maps/018-3.tmx +++ b/maps/018-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" nextobjectid="63"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="63"> <properties> <property name="minimap" value="graphics/minimaps/018-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -13,12 +13,12 @@ <tileset firstgid="659" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="915" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="963" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="995" source="../tilesets/woodland_x2.tsx"/> - <tileset firstgid="1027" source="../tilesets/woodland_x3.tsx"/> - <tileset firstgid="1059" source="../tilesets/woodland_village.tsx"/> - <tileset firstgid="1315" source="../tilesets/woodland_village_x2.tsx"/> - <tileset firstgid="1331" source="../tilesets/evil_obelisk.tsx"/> - <layer name="Ground1" width="200" height="200"> + <tileset firstgid="1011" source="../tilesets/woodland_x2.tsx"/> + <tileset firstgid="1043" source="../tilesets/woodland_x3.tsx"/> + <tileset firstgid="1075" source="../tilesets/woodland_village.tsx"/> + <tileset firstgid="1331" source="../tilesets/woodland_village_x2.tsx"/> + <tileset firstgid="1347" source="../tilesets/evil_obelisk.tsx"/> + <layer id="1" name="Ground1" width="200" height="200"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -222,7 +222,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,113,113,113,113,113,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="200" height="200"> + <layer id="2" name="Ground2" width="200" height="200"> <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, @@ -255,15 +255,15 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,0,0,0,1211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,0,0,0,1227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,125,0,0,0,0,0,0,0,294,295,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,238,234,0,125,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,125,0,0,246,1310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,262,1310,1310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,125,0,0,246,1326,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,262,1326,1326,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,238,234,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,294,295,271,0,0,0,0,0,0,739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,0,246,0,0,0,0,0,0,739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -272,11 +272,11 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,232,233,234,0,0,0,0,0,0,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,125,0,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,246,0,0,0,0,0,0,1120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,238,234,0,0,0,0,0,0,246,0,0,0,0,0,0,1120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,230,235,0,0,0,0,0,0,1210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,238,234,0,0,0,0,246,1195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,246,1195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,246,0,0,0,0,0,0,1136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,238,234,0,0,0,0,0,0,246,0,0,0,0,0,0,1136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,230,235,0,0,0,0,0,0,1226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,238,234,0,0,0,0,246,1211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,246,1211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,669,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,685,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,250,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -426,7 +426,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,181,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="200" height="200"> + <layer id="3" name="Fringe" width="200" height="200"> <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, @@ -456,7 +456,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,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1331,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -465,7 +465,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,131,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,1330,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,1346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -473,7 +473,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,131,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,1321,1322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,1337,1338,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,132,133,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -552,22 +552,22 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,967,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,1019,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -575,7 +575,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -584,8 +584,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1002,1003,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -630,7 +630,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 </data> </layer> - <layer name="Over1" width="200" height="200"> + <layer id="4" name="Over1" width="200" height="200"> <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, @@ -834,7 +834,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 </data> </layer> - <layer name="Collision" width="200" height="200"> + <layer id="5" name="Collision" width="200" height="200"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1038,318 +1038,318 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="6" name="Objects"> <object id="1" name="To Woodland Hills" type="warp" x="3168" y="4256" width="64" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="79"/> - <property name="dest_tile_y" value="60"/> + <property name="dest_x" value="79"/> + <property name="dest_y" value="60"/> </properties> </object> <object id="2" name="To Woodland Mining Camp" type="warp" x="1408" y="1248" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="112"/> - <property name="dest_tile_y" value="62"/> + <property name="dest_x" value="112"/> + <property name="dest_y" value="62"/> </properties> </object> <object id="3" name="To Woodland Hills" type="warp" x="1568" y="3200" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="128"/> - <property name="dest_tile_y" value="57"/> + <property name="dest_x" value="128"/> + <property name="dest_y" value="57"/> </properties> </object> <object id="4" name="To Woodland Mining Camp" type="warp" x="3936" y="5344" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="90"/> - <property name="dest_tile_y" value="43"/> + <property name="dest_x" value="90"/> + <property name="dest_y" value="43"/> </properties> </object> <object id="5" name="To Woodland Hills" type="warp" x="2240" y="3392" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="69"/> - <property name="dest_tile_y" value="55"/> + <property name="dest_x" value="69"/> + <property name="dest_y" value="55"/> </properties> </object> <object id="6" name="To Woodland Hills Cave" type="warp" x="1600" y="2816" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="69"/> - <property name="dest_tile_y" value="142"/> + <property name="dest_x" value="69"/> + <property name="dest_y" value="142"/> </properties> </object> <object id="7" name="To Woodland Mining Camp" type="warp" x="4640" y="5216" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="153"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="153"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="8" name="To Woodland Hills" type="warp" x="2048" y="3328" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="158"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="158"/> + <property name="dest_y" value="35"/> </properties> </object> <object id="9" name="To Woodland Mining Camp" type="warp" x="928" y="5344" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="162"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="162"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="10" name="To Fight Cave" type="warp" x="3104" y="2208" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="178"/> - <property name="dest_tile_y" value="43"/> + <property name="dest_x" value="178"/> + <property name="dest_y" value="43"/> </properties> </object> <object id="11" name="To Woodland Hills Cave" type="warp" x="864" y="1728" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="169"/> - <property name="dest_tile_y" value="44"/> + <property name="dest_x" value="169"/> + <property name="dest_y" value="44"/> </properties> </object> <object id="12" name="To Fight Cave" type="warp" x="4288" y="2016" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="152"/> - <property name="dest_tile_y" value="29"/> + <property name="dest_x" value="152"/> + <property name="dest_y" value="29"/> </properties> </object> <object id="13" name="To Woodland Mining Camp Indoor" type="warp" x="5664" y="1792" width="32" height="32"> <properties> <property name="dest_map" value="018-2"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="20"/> </properties> </object> <object id="14" name="To Woodland Hills Cave" type="warp" x="5504" y="672" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="123"/> - <property name="dest_tile_y" value="103"/> + <property name="dest_x" value="123"/> + <property name="dest_y" value="103"/> </properties> </object> <object id="15" name="To Jack O Cave" type="warp" x="5664" y="672" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="147"/> - <property name="dest_tile_y" value="103"/> + <property name="dest_x" value="147"/> + <property name="dest_y" value="103"/> </properties> </object> <object id="16" name="To Jack O Cave" type="warp" x="864" y="2912" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="158"/> - <property name="dest_tile_y" value="67"/> + <property name="dest_x" value="158"/> + <property name="dest_y" value="67"/> </properties> </object> <object id="17" name="To Fight Cave" type="warp" x="2880" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="67"/> - <property name="dest_tile_y" value="50"/> + <property name="dest_x" value="67"/> + <property name="dest_y" value="50"/> </properties> </object> <object id="18" name="To Black Scorpion Cave" type="warp" x="2272" y="3904" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="111"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="111"/> + <property name="dest_y" value="41"/> </properties> </object> <object id="19" name="To Woodland Hills Cave" type="warp" x="5568" y="2720" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="62"/> - <property name="dest_tile_y" value="99"/> + <property name="dest_x" value="62"/> + <property name="dest_y" value="99"/> </properties> </object> <object id="20" name="To Woodland Hills Cave" type="warp" x="3264" y="2208" width="32" height="32"> <properties> <property name="dest_map" value="013-3"/> - <property name="dest_tile_x" value="68"/> - <property name="dest_tile_y" value="96"/> + <property name="dest_x" value="68"/> + <property name="dest_y" value="96"/> </properties> </object> <object id="21" name="To Hurnscald Cave" type="warp" x="5728" y="5792" width="32" height="32"> <properties> <property name="dest_map" value="009-3"/> - <property name="dest_tile_x" value="157"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="157"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="22" name="Bat" type="spawn" x="640" y="640" width="1856" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="15"/> </properties> </object> <object id="23" name="EvilMushroom" type="spawn" x="640" y="3840" width="1024" height="1568"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="30000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="11"/> </properties> </object> <object id="24" name="Spider" type="spawn" x="672" y="1728" width="928" height="736"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="10"/> </properties> </object> <object id="25" name="PinkFlower" type="spawn" x="864" y="4992" width="128" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="12"/> </properties> </object> <object id="26" name="YellowSlime" type="spawn" x="2912" y="2912" width="576" height="1344"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="90000"/> + <property name="death" value="30000"/> + <property name="spawn" value="90000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> <object id="27" name="Maggot" type="spawn" x="4096" y="4352" width="416" height="288"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="0"/> </properties> </object> <object id="28" name="Spider" type="spawn" x="1472" y="4352" width="2368" height="864"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="300000"/> + <property name="death" value="120000"/> + <property name="spawn" value="300000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="10"/> </properties> </object> <object id="29" name="BlackScorpion" type="spawn" x="1184" y="5312" width="4224" height="448"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="10000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="7"/> </properties> </object> <object id="30" name="YellowSlime" type="spawn" x="5408" y="704" width="352" height="1024"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="180000"/> + <property name="death" value="120000"/> + <property name="spawn" value="180000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="5"/> </properties> </object> <object id="32" name="Bat" type="spawn" x="4544" y="4352" width="448" height="800"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="180000"/> + <property name="death" value="40000"/> + <property name="spawn" value="180000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="15"/> </properties> </object> <object id="33" name="YellowSlime" type="spawn" x="4032" y="2688" width="704" height="256"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="5"/> </properties> </object> <object id="34" name="RedSlime" type="spawn" x="2176" y="2144" width="896" height="704"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="6"/> </properties> </object> <object id="35" name="BlackScorpion" type="spawn" x="3488" y="2464" width="192" height="224"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="80000"/> + <property name="death" value="40000"/> + <property name="spawn" value="80000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="7"/> </properties> </object> <object id="36" name="Snake" type="spawn" x="5536" y="3264" width="192" height="1312"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="20000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="8"/> </properties> </object> <object id="40" name="RedSlime" type="spawn" x="5248" y="2752" width="576" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="6"/> </properties> </object> <object id="41" name="Spider" type="spawn" x="1728" y="2912" width="384" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="10"/> </properties> </object> <object id="42" name="BlackScorpion" type="spawn" x="2112" y="2848" width="768" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="7"/> </properties> </object> <object id="43" name="Snake" type="spawn" x="2752" y="1632" width="544" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="8"/> </properties> </object> <object id="44" name="Spider" type="spawn" x="4064" y="992" width="416" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="10"/> </properties> </object> <object id="45" name="Snake" type="spawn" x="3072" y="800" width="992" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="8"/> </properties> </object> <object id="46" name="CaveSnake" type="spawn" x="2112" y="3168" width="192" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="30000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="19"/> </properties> @@ -1368,22 +1368,22 @@ <object id="58" name="To Woodland Mining Camp" type="warp" x="3424" y="4672" width="32" height="32"> <properties> <property name="dest_map" value="018-1"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="33"/> </properties> </object> <object id="61" name="CaveMaggot" type="spawn" x="4608" y="2816" width="608" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="54"/> </properties> </object> <object id="62" name="CaveMaggot" type="spawn" x="2912" y="2912" width="576" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="54"/> </properties> diff --git a/maps/019-1.tmx b/maps/019-1.tmx index 1e34b01e..56e94a3a 100644 --- a/maps/019-1.tmx +++ b/maps/019-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" infinite="0" nextobjectid="23"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="23"> <properties> <property name="minimap" value="graphics/minimaps/019-1.png"/> <property name="music" value="snow-village.ogg"/> @@ -13,7 +13,7 @@ <tileset firstgid="356" name="npcs" tilewidth="50" tileheight="80" tilecount="42" columns="14"> <image source="../graphics/sprites/npcs/2006__npcs.png" width="700" height="240"/> </tileset> - <layer name="Ground1" width="138" height="128"> + <layer id="1" name="Ground1" width="138" height="128"> <data encoding="csv"> 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,304,304,304,304,304,304,304,304,304,304, @@ -145,7 +145,7 @@ 86,8,8,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,8,8,8,8,8,8,8,8,8,8,8,8,8,86,86,8,8,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86 </data> </layer> - <layer name="Ground2" width="138" height="128"> + <layer id="2" name="Ground2" width="138" height="128"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,179,180,180,180,180,179,180,180,180,180,163,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,164,164,165,180,181,32,33,34,179,180,180,180,180,180,180,180,180,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,164,164,164,165,180,180,181,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,179,180,180,180,180,179,180,180,180,180,179,180,180,163,164,164,164,164,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,164,164,164,165,180,180,180,181,180,181,32,33,34,179,180,180,180,180,180,180,180,180,163,164,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,164,165,180,180,180,180,181,180,180,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,0,0, @@ -277,7 +277,7 @@ 0,87,26,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,26,0,0,0,0,0,0,0,0,0,0,105,0,0,103,0,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,89,0,0,0,0,0,0,0,0,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="138" height="128"> + <layer id="3" name="Ground3" width="138" height="128"> <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, @@ -409,7 +409,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 </data> </layer> - <layer name="Fringe" width="138" height="128"> + <layer id="4" name="Fringe" width="138" height="128"> <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,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -541,7 +541,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,275,0,275,0,0,0,275,0,276,0,276,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,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="138" height="128"> + <layer id="5" name="Over1" width="138" height="128"> <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, @@ -673,7 +673,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 </data> </layer> - <layer name="Over2" width="138" height="128"> + <layer id="6" name="Over2" width="138" height="128"> <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, @@ -805,7 +805,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 </data> </layer> - <layer name="Collision" width="138" height="128"> + <layer id="7" name="Collision" width="138" height="128"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -937,7 +937,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="8" name="Objects"> <object id="1" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2000" y="592"/> <object id="2" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2032" y="592"/> <object id="3" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2000" y="624"/> @@ -955,44 +955,44 @@ <object id="15" name="To Nivalis" type="warp" x="2176" y="672" width="128" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="70"/> - <property name="dest_tile_y" value="127"/> + <property name="dest_x" value="70"/> + <property name="dest_y" value="127"/> </properties> </object> <object id="16" name="To Snow Cave" type="warp" x="3072" y="1280" width="32" height="32"> <properties> <property name="dest_map" value="019-3"/> - <property name="dest_tile_x" value="98"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="98"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="17" name="To Snow Cave" type="warp" x="1216" y="2400" width="32" height="32"> <properties> <property name="dest_map" value="019-3"/> - <property name="dest_tile_x" value="39"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="39"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="18" name="Fluffy" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="50"/> <property name="monster_id" value="18"/> </properties> </object> <object id="19" name="Reinboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="92"/> </properties> </object> <object id="20" name="WhiteBell" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="93"/> </properties> @@ -1000,14 +1000,14 @@ <object id="21" name="To Snow Path" type="warp" x="672" y="2208" width="32" height="64"> <properties> <property name="dest_map" value="033-1"/> - <property name="dest_tile_x" value="118"/> - <property name="dest_tile_y" value="69"/> + <property name="dest_x" value="118"/> + <property name="dest_y" value="69"/> </properties> </object> <object id="22" name="Santaboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="1112"/> </properties> diff --git a/maps/019-3.tmx b/maps/019-3.tmx index e76e5f92..97778cec 100644 --- a/maps/019-3.tmx +++ b/maps/019-3.tmx @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="142" height="132" tilewidth="32" tileheight="32" nextobjectid="7"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="142" height="132" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="7"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Snow Cave"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/icecave.tsx"/> - <layer name="Ground1" width="142" height="132"> + <layer id="1" name="Ground1" width="142" height="132"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -142,7 +142,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="142" height="132"> + <layer id="2" name="Ground2" width="142" height="132"> <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, @@ -278,7 +278,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 </data> </layer> - <layer name="Fringe" width="142" height="132"> + <layer id="3" name="Fringe" width="142" height="132"> <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, @@ -414,7 +414,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 </data> </layer> - <layer name="Over1" width="142" height="132"> + <layer id="4" name="Over1" width="142" height="132"> <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, @@ -550,7 +550,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 </data> </layer> - <layer name="Collision" width="142" height="132"> + <layer id="5" name="Collision" width="142" height="132"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -686,33 +686,33 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="6" name="Objects"> <object id="1" name="To Snow Field" type="warp" x="1280" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="019-1"/> - <property name="dest_tile_x" value="37"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="37"/> + <property name="dest_y" value="74"/> </properties> </object> <object id="2" name="To Snow Field" type="warp" x="3136" y="928" width="32" height="32"> <properties> <property name="dest_map" value="019-1"/> - <property name="dest_tile_x" value="96"/> - <property name="dest_tile_y" value="39"/> + <property name="dest_x" value="96"/> + <property name="dest_y" value="39"/> </properties> </object> <object id="3" name="Moggun" type="spawn" x="0" y="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="59"/> </properties> </object> <object id="4" name="Bat" type="spawn" x="0" y="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="50"/> <property name="monster_id" value="15"/> </properties> @@ -720,8 +720,8 @@ <object id="6" name="To Frozen Lake" type="warp" x="2560" y="3296" width="32" height="32"> <properties> <property name="dest_map" value="030-3"/> - <property name="dest_tile_x" value="54"/> - <property name="dest_tile_y" value="70"/> + <property name="dest_x" value="54"/> + <property name="dest_y" value="70"/> </properties> </object> </objectgroup> diff --git a/maps/019-4.tmx b/maps/019-4.tmx index fc05c1ef..6f557a30 100644 --- a/maps/019-4.tmx +++ b/maps/019-4.tmx @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="150" tilewidth="32" tileheight="32" nextobjectid="10"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="10"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Snow Cave"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/icecave.tsx"/> - <layer name="Ground1" width="100" height="150"> + <layer id="1" name="Ground1" width="100" height="150"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -160,7 +160,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="100" height="150"> + <layer id="2" name="Ground2" width="100" height="150"> <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, @@ -314,7 +314,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 </data> </layer> - <layer name="Fringe" width="100" height="150"> + <layer id="3" name="Fringe" width="100" height="150"> <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, @@ -468,7 +468,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 </data> </layer> - <layer name="Over1" width="100" height="150"> + <layer id="4" name="Over1" width="100" height="150"> <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, @@ -622,7 +622,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 </data> </layer> - <layer name="Collision" width="100" height="150"> + <layer id="5" name="Collision" width="100" height="150"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -776,36 +776,36 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="6" name="Objects"> <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1536" y="2208" width="32" height="32"/> <object id="3" name="Moggun" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="45000"/> + <property name="death" value="30000"/> + <property name="spawn" value="45000"/> <property name="max_beings" value="12"/> <property name="monster_id" value="59"/> </properties> </object> <object id="4" name="WhiteSlime" type="spawn" x="1292" y="2024" width="523" height="329"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="45000"/> + <property name="death" value="45000"/> + <property name="spawn" value="45000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="91"/> </properties> </object> <object id="5" name="Bat" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="25000"/> - <property name="eA_spawn" value="45000"/> + <property name="death" value="25000"/> + <property name="spawn" value="45000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="15"/> </properties> </object> <object id="6" name="BlueSlime" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="45000"/> + <property name="death" value="30000"/> + <property name="spawn" value="45000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="89"/> </properties> @@ -813,15 +813,15 @@ <object id="7" name="To Snow Hills" type="warp" x="2368" y="896" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="154"/> - <property name="dest_tile_y" value="93"/> + <property name="dest_x" value="154"/> + <property name="dest_y" value="93"/> </properties> </object> <object id="8" name="To Snow Hills" type="warp" x="768" y="3968" width="64" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="62"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="62"/> + <property name="dest_y" value="27"/> </properties> </object> </objectgroup> diff --git a/maps/020-1.tmx b/maps/020-1.tmx index a5e5b5ce..e3751983 100644 --- a/maps/020-1.tmx +++ b/maps/020-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="128" height="148" tilewidth="32" tileheight="32" nextobjectid="26"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="128" height="148" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="26"> <properties> <property name="minimap" value="graphics/minimaps/020-1.png"/> <property name="music" value="snow-village.ogg"/> @@ -15,7 +15,7 @@ <tileset firstgid="616" source="../tilesets/snow_village_x3.tsx"/> <tileset firstgid="626" source="../tilesets/snow_village_x4.tsx"/> <tileset firstgid="636" source="../tilesets/snow_x4.tsx"/> - <layer name="Ground1" width="128" height="148"> + <layer id="1" name="Ground1" width="128" height="148"> <data encoding="csv"> 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,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,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86, 148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,148,86,86,86,86,86,148,86,86,86,86,86,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,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,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,148,148,148,148,148,86,86,86,86,86,86,86,86,86, @@ -167,7 +167,7 @@ 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,8,8,8,8,8,8,8,8,86,86,70,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,148,148,148,148,86,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,86,86,86,86,86,86,86,86,86,86 </data> </layer> - <layer name="Ground2" width="128" height="148"> + <layer id="2" name="Ground2" width="128" height="148"> <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,134,165,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,87,88,89,0,0,0,0,0,179,147,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,0,149,150,132,133,0,0,0,0,150,133,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,197,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,103,0,41,89,0,0,0,0,195,163,135,0,0,0,0,0,0,0,0,0,119,120,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,134,165,0,0,150,132,132,132,133,0,150,132,132,133,0,0,0,0,0,0,0,0,0,0, @@ -319,7 +319,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,196,196,196,196,197,149,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,119,11,0,0,9,120,120,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,181,147,148,148,148,148,148,148,149,0,0,0,0,0,0,0,9,120,121,70,119,0,0,0,0,0,41,89,147,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Ground3" width="128" height="148"> + <layer id="3" name="Ground3" width="128" height="148"> <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, @@ -471,7 +471,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 </data> </layer> - <layer name="Fringe" width="128" height="148"> + <layer id="4" name="Fringe" width="128" height="148"> <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,275,0,0,275,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0, 275,0,0,0,0,275,0,0,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,275,0,0,275,0,275,0,0,0,0,0,0,0,275,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,276,0,275,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,275,0,0,0,275,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,275,0,0,0,0,0,0,0,0, @@ -623,7 +623,7 @@ 0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,119,11,276,0,0,0,276,9,120,0,148,119,11,0,275,0,0,41,195,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Over1" width="128" height="148"> + <layer id="5" name="Over1" width="128" height="148"> <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, @@ -775,7 +775,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 </data> </layer> - <layer name="Over2" width="128" height="148"> + <layer id="6" name="Over2" width="128" height="148"> <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, @@ -927,7 +927,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,179,181,0,0,0,0,0,0,0,0,0,0,0,0,0,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="Over3" width="128" height="148"> + <layer id="7" name="Over3" width="128" height="148"> <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, @@ -1079,7 +1079,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 </data> </layer> - <layer name="Collision" width="128" height="148"> + <layer id="8" name="Collision" width="128" height="148"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1231,26 +1231,26 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="9" name="Objects" visible="0"> <object id="1" name="To Ice Cave" type="warp" x="2400" y="1216" width="96" height="32"> <properties> <property name="dest_map" value="020-3"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="26"/> </properties> </object> <object id="2" name="To Nivalis Indoor" type="warp" x="1504" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="020-2"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="35"/> </properties> </object> <object id="3" name="To Nivalis House" type="warp" x="2112" y="1664" width="32" height="32"> <properties> <property name="dest_map" value="020-2"/> - <property name="dest_tile_x" value="72"/> - <property name="dest_tile_y" value="70"/> + <property name="dest_x" value="72"/> + <property name="dest_y" value="70"/> </properties> </object> <object id="4" name="graphics/particles/whirlpool.particle.xml" type="particle_effect" x="2000" y="4016"/> @@ -1270,49 +1270,49 @@ <object id="18" name="To Nivalis Inn" type="warp" x="2048" y="2624" width="32" height="32"> <properties> <property name="dest_map" value="020-2"/> - <property name="dest_tile_x" value="111"/> - <property name="dest_tile_y" value="32"/> + <property name="dest_x" value="111"/> + <property name="dest_y" value="32"/> </properties> </object> <object id="19" name="To Armory" type="warp" x="2752" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="020-2"/> - <property name="dest_tile_x" value="32"/> - <property name="dest_tile_y" value="73"/> + <property name="dest_x" value="32"/> + <property name="dest_y" value="73"/> </properties> </object> <object id="20" name="To Nivalis Shop" type="warp" x="1824" y="2912" width="32" height="32"> <properties> <property name="dest_map" value="020-2"/> - <property name="dest_tile_x" value="65"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="65"/> + <property name="dest_y" value="23"/> </properties> </object> <object id="21" name="To Snow Field" type="warp" x="2176" y="4096" width="128" height="32"> <properties> <property name="dest_map" value="019-1"/> - <property name="dest_tile_x" value="70"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="70"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="22" name="To Nivalis Port" type="warp" x="3424" y="1760" width="32" height="32"> <properties> <property name="dest_map" value="031-1"/> - <property name="dest_tile_x" value="38"/> - <property name="dest_tile_y" value="55"/> + <property name="dest_x" value="38"/> + <property name="dest_y" value="55"/> </properties> </object> <object id="23" name="To Nivalis Storage" type="warp" x="1888" y="1440" width="32" height="32"> <properties> <property name="dest_map" value="020-2"/> - <property name="dest_tile_x" value="127"/> - <property name="dest_tile_y" value="68"/> + <property name="dest_x" value="127"/> + <property name="dest_y" value="68"/> </properties> </object> <object id="24" name="WhiteBell" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="93"/> </properties> @@ -1320,8 +1320,8 @@ <object id="25" name="To Christmas Inn" type="warp" x="1056" y="2976" width="32" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="88"/> - <property name="dest_tile_y" value="50"/> + <property name="dest_x" value="88"/> + <property name="dest_y" value="50"/> </properties> </object> </objectgroup> diff --git a/maps/020-2.tmx b/maps/020-2.tmx index 10b7a15a..1a762ac1 100644 --- a/maps/020-2.tmx +++ b/maps/020-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="160" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="7"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="160" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="7"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Nivalis Indoor"/> @@ -533,43 +533,43 @@ <object id="1" name="To Outside" type="warp" x="800" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="47"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="47"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="2" name="To Outside" type="warp" x="2048" y="736" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="56"/> - <property name="dest_tile_y" value="91"/> + <property name="dest_x" value="56"/> + <property name="dest_y" value="91"/> </properties> </object> <object id="3" name="To Outside" type="warp" x="3552" y="1056" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="83"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="83"/> </properties> </object> <object id="4" name="To Outside" type="warp" x="1024" y="2368" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="86"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="86"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="5" name="To Outside" type="warp" x="2304" y="2272" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="66"/> - <property name="dest_tile_y" value="53"/> + <property name="dest_x" value="66"/> + <property name="dest_y" value="53"/> </properties> </object> <object id="6" name="To Outside" type="warp" x="4064" y="2208" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="46"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="46"/> </properties> </object> </objectgroup> diff --git a/maps/020-3.tmx b/maps/020-3.tmx index 72f33b2f..0bb7c60d 100644 --- a/maps/020-3.tmx +++ b/maps/020-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="160" height="160" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="160" height="160" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="12"> <properties> <property name="minimap" value="graphics/minimaps/020-3.png"/> <property name="music" value="snow-village.ogg"/> @@ -7,7 +7,7 @@ </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/icecave.tsx"/> - <layer name="Ground1" width="160" height="160"> + <layer id="1" name="Ground1" width="160" height="160"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -171,7 +171,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="160" height="160"> + <layer id="2" name="Fringe" width="160" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -335,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="160" height="160"> + <layer id="3" name="Over1" width="160" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -499,7 +499,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 </data> </layer> - <layer name="Collision" width="160" height="160"> + <layer id="4" name="Collision" width="160" height="160"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -663,82 +663,82 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="Bat" type="spawn" x="832" y="1088" width="960" height="160"> + <objectgroup id="5" name="Objects" visible="0"> + <object id="1" name="Bat" type="spawn" x="832" y="1088" width="960" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="monster_id" value="15"/> </properties> </object> - <object name="Pinkie" type="spawn" x="736" y="1472" width="1120" height="256"> + <object id="2" name="Pinkie" type="spawn" x="736" y="1472" width="1120" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="monster_id" value="16"/> </properties> </object> - <object name="To Nivalis" type="warp" x="992" y="800" width="32" height="32"> + <object id="3" name="To Nivalis" type="warp" x="992" y="800" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="76"/> - <property name="dest_tile_y" value="37"/> + <property name="dest_x" value="76"/> + <property name="dest_y" value="37"/> </properties> </object> - <object name="To Ice Cave" type="warp" x="800" y="704" width="32" height="32"> + <object id="4" name="To Ice Cave" type="warp" x="800" y="704" width="32" height="32"> <properties> <property name="dest_map" value="020-3"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="101"/> </properties> </object> - <object name="To Ice Entrance" type="warp" x="3104" y="3168" width="32" height="32"> + <object id="5" name="To Ice Entrance" type="warp" x="3104" y="3168" width="32" height="32"> <properties> <property name="dest_map" value="020-3"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="24"/> </properties> </object> - <object name="To Ice Cave" type="warp" x="896" y="1824" width="32" height="32"> + <object id="6" name="To Ice Cave" type="warp" x="896" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="020-3"/> - <property name="dest_tile_x" value="33"/> - <property name="dest_tile_y" value="99"/> + <property name="dest_x" value="33"/> + <property name="dest_y" value="99"/> </properties> </object> - <object name="To Ice Cave" type="warp" x="1568" y="1056" width="32" height="32"> + <object id="7" name="To Ice Cave" type="warp" x="1568" y="1056" width="32" height="32"> <properties> <property name="dest_map" value="020-3"/> - <property name="dest_tile_x" value="110"/> - <property name="dest_tile_y" value="56"/> + <property name="dest_x" value="110"/> + <property name="dest_y" value="56"/> </properties> </object> - <object name="To Ice Entrance" type="warp" x="1056" y="3136" width="32" height="32"> + <object id="8" name="To Ice Entrance" type="warp" x="1056" y="3136" width="32" height="32"> <properties> <property name="dest_map" value="020-3"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="56"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="56"/> </properties> </object> - <object name="To Ice Entrance" type="warp" x="3520" y="1824" width="32" height="32"> + <object id="9" name="To Ice Entrance" type="warp" x="3520" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="020-3"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="34"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="34"/> </properties> </object> - <object name="Bat" type="spawn" x="0" y="0"> + <object id="10" name="Bat" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="20"/> <property name="monster_id" value="15"/> </properties> </object> - <object name="Pinkie" type="spawn" x="0" y="0"> + <object id="11" name="Pinkie" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="0"/> - <property name="eA_spawn" value="0"/> + <property name="death" value="0"/> + <property name="spawn" value="0"/> <property name="max_beings" value="10"/> <property name="monster_id" value="16"/> </properties> diff --git a/maps/021-3.tmx b/maps/021-3.tmx index 8cb51262..e553f0d3 100644 --- a/maps/021-3.tmx +++ b/maps/021-3.tmx @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="178" height="168" tilewidth="32" tileheight="32" nextobjectid="43"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="178" height="168" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="43"> <properties> <property name="minimap" value="graphics/minimaps/021-3.png"/> - <property name="music" value="faith.ogg"/> + <property name="music" value="SewerAmbience.ogg"/> <property name="name" value="Central Tulimshar Sewers"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> @@ -16,7 +16,7 @@ <tileset firstgid="1135" source="../tilesets/cave2_sewer_mine_x4.tsx"/> <tileset firstgid="1151" source="../tilesets/cave2_transistions.tsx"/> <tileset firstgid="1407" source="../tilesets/cave2_x2.tsx"/> - <layer name="Ground1" width="178" height="168" opacity="0.98"> + <layer id="1" name="Ground1" width="178" height="168" opacity="0.98"> <data encoding="csv"> 27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,52,53,53,54,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27, 27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,52,53,53,54,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27, @@ -188,7 +188,7 @@ 27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27 </data> </layer> - <layer name="Ground2" width="178" height="168"> + <layer id="2" name="Ground2" width="178" height="168"> <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, @@ -360,7 +360,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 </data> </layer> - <layer name="Ground3" width="178" height="168"> + <layer id="3" name="Ground3" width="178" height="168"> <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, @@ -532,7 +532,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 </data> </layer> - <layer name="Fringe" width="178" height="168"> + <layer id="4" name="Fringe" width="178" height="168"> <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, @@ -704,7 +704,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 </data> </layer> - <layer name="Over1" width="178" height="168"> + <layer id="5" name="Over1" width="178" height="168"> <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, @@ -876,7 +876,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 </data> </layer> - <layer name="Over2" width="178" height="168"> + <layer id="6" name="Over2" width="178" height="168"> <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, @@ -1048,7 +1048,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 </data> </layer> - <layer name="Collision" width="178" height="168"> + <layer id="7" name="Collision" width="178" height="168"> <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,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1220,19 +1220,19 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="8" name="Objects"> <object id="1" name="To Central Tulimshar" type="warp" x="4576" y="4064" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="117"/> - <property name="dest_tile_y" value="109"/> + <property name="dest_x" value="117"/> + <property name="dest_y" value="109"/> </properties> </object> <object id="3" name="To Central Tulimshar" type="warp" x="1824" y="3168" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="84"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="84"/> </properties> </object> <object id="4" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2848" y="1888" width="32" height="32"/> @@ -1252,47 +1252,47 @@ <object id="18" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3936" y="1376" width="32" height="32"/> <object id="19" name="CaveMaggot" type="spawn" x="3680" y="1088" width="384" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="54"/> </properties> </object> <object id="20" name="CaveMaggot" type="spawn" x="3168" y="1824" width="288" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="54"/> </properties> </object> <object id="21" name="CaveMaggot" type="spawn" x="2016" y="2656" width="1120" height="1024"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="54"/> </properties> </object> <object id="22" name="CaveMaggot" type="spawn" x="4000" y="2592" width="288" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="54"/> </properties> </object> <object id="23" name="AngryFireGoblin" type="spawn" x="4224" y="1088" width="544" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="106"/> </properties> </object> <object id="24" name="BlackScorpion" type="spawn" x="2016" y="2656" width="1088" height="1024"> <properties> - <property name="eA_spawn" value="100000"/> + <property name="spawn" value="100000"/> <property name="ea_death" value="1800000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="7"/> @@ -1300,32 +1300,32 @@ </object> <object id="25" name="GreenSlime" type="spawn" x="1632" y="1456" width="96" height="576"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="50000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="3"/> </properties> </object> <object id="26" name="SeaSlime" type="spawn" x="2528" y="640" width="928" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="31"/> </properties> </object> <object id="39" name="CaveMaggot" type="spawn" x="3744" y="4064" width="288" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="54"/> </properties> </object> <object id="40" name="CaveMaggot" type="spawn" x="1376" y="4416" width="288" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="54"/> </properties> @@ -1333,15 +1333,15 @@ <object id="41" name="To Beach" type="warp" x="928" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="001-1"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="42" name="To Sea Cave" type="warp" x="1408" y="4576" width="32" height="32"> <properties> <property name="dest_map" value="004-3"/> - <property name="dest_tile_x" value="80"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="80"/> + <property name="dest_y" value="23"/> </properties> </object> </objectgroup> diff --git a/maps/023-1.tmx b/maps/023-1.tmx index 83e413b7..841c2238 100644 --- a/maps/023-1.tmx +++ b/maps/023-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="160" height="170" tilewidth="32" tileheight="32" infinite="0" nextobjectid="28"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="160" height="170" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="28"> <properties> <property name="music" value="peace.ogg"/> <property name="name" value="Tulimshar Lighthouse Beach"/> @@ -19,7 +19,7 @@ <tileset firstgid="1561" source="../tilesets/waterflow.tsx"/> <tileset firstgid="1633" source="../tilesets/water.tsx"/> <tileset firstgid="1798" source="../tilesets/water_overflow.tsx"/> - <layer name="Ground1" width="160" height="170"> + <layer id="1" name="Ground1" width="160" height="170"> <data encoding="csv"> 1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596, 1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1578,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596,1596, @@ -193,7 +193,7 @@ 1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1569,1796,1778,3,3,3,3,3,3,3,3,3,3,3,3,605,605,605,605,605,605,605,605,605,605,605,605,605,605,605,605,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,374,391,359,359,359,359,406,343,343,343,343,343,343,343,343,343,343,343,344,387,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,439,404,438,388,388,388,388,388,388,389,1780,1796,1623,1623,1623,1623,1623,1623,1623,1623,1623,1623,1623 </data> </layer> - <layer name="Ground2" width="160" height="170"> + <layer id="2" name="Ground2" width="160" height="170"> <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, @@ -367,7 +367,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,1775,1770,914,101,0,0,0,0,0,0,0,0,0,0,681,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1165,1149,1150,1151,1152,1153,1154,1149,1150,1151,1152,1153,1154,1149,1150,1151,1152,1153,1154,1149,1150,1151,1152,1153,1149,1150,1151,1152,1153,1154,1145,0,1146,1151,1152,1153,1151,1152,1153,1166,916,1768,1773,1020,1021,1022,1020,1021,1022,1020,1021,1022,0 </data> </layer> - <layer name="Ground3" width="160" height="170"> + <layer id="3" name="Ground3" width="160" height="170"> <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, @@ -541,7 +541,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,1007,1020,1021,1022,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Ground4" width="160" height="170"> + <layer id="4" name="Ground4" width="160" height="170"> <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, @@ -715,7 +715,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 </data> </layer> - <layer name="Fringe" width="160" height="170"> + <layer id="5" name="Fringe" width="160" height="170"> <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, @@ -889,7 +889,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 </data> </layer> - <layer name="Over1" width="160" height="170"> + <layer id="6" name="Over1" width="160" height="170"> <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, @@ -1063,7 +1063,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,101,0,0,0,0,0,0,0,0,0,0,681,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,87,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1000,0,0,0,0,0,0,0,0,1000,0 </data> </layer> - <layer name="Over2" width="160" height="170"> + <layer id="7" name="Over2" width="160" height="170"> <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, @@ -1237,7 +1237,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 </data> </layer> - <layer name="Collision" width="160" height="170"> + <layer id="8" name="Collision" width="160" height="170"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1411,184 +1411,184 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="9" name="Objects" visible="0"> <object id="2" name="To Tulismhar Suburbs" type="warp" x="2048" y="4672" width="64" height="32"> <properties> <property name="dest_map" value="042-1"/> - <property name="dest_tile_x" value="65"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="65"/> + <property name="dest_y" value="24"/> </properties> </object> <object id="3" name="To Lighthouse Caves" type="warp" x="2400" y="4288" width="32" height="32"> <properties> <property name="dest_map" value="023-3"/> - <property name="dest_tile_x" value="75"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="75"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="4" name="To Lighthouse Caves" type="warp" x="2272" y="3744" width="32" height="32"> <properties> <property name="dest_map" value="023-3"/> - <property name="dest_tile_x" value="71"/> - <property name="dest_tile_y" value="114"/> + <property name="dest_x" value="71"/> + <property name="dest_y" value="114"/> </properties> </object> <object id="5" name="To Lighthouse Caves" type="warp" x="2656" y="3648" width="32" height="32"> <properties> <property name="dest_map" value="023-3"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="112"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="112"/> </properties> </object> <object id="6" name="To Lighthouse Caves" type="warp" x="3424" y="3840" width="32" height="32"> <properties> <property name="dest_map" value="023-3"/> - <property name="dest_tile_x" value="106"/> - <property name="dest_tile_y" value="118"/> + <property name="dest_x" value="106"/> + <property name="dest_y" value="118"/> </properties> </object> <object id="7" name="To Lighthouse Caves" type="warp" x="3360" y="3648" width="32" height="32"> <properties> <property name="dest_map" value="023-3"/> - <property name="dest_tile_x" value="106"/> - <property name="dest_tile_y" value="115"/> + <property name="dest_x" value="106"/> + <property name="dest_y" value="115"/> </properties> </object> <object id="8" name="To Lighthouse Caves" type="warp" x="2240" y="3040" width="32" height="32"> <properties> <property name="dest_map" value="023-3"/> - <property name="dest_tile_x" value="70"/> - <property name="dest_tile_y" value="93"/> + <property name="dest_x" value="70"/> + <property name="dest_y" value="93"/> </properties> </object> <object id="9" name="To Lighthouse Caves" type="warp" x="1536" y="2560" width="32" height="32"> <properties> <property name="dest_map" value="023-3"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="78"/> </properties> </object> <object id="10" name="To Lighthouse Caves" type="warp" x="1952" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="023-3"/> - <property name="dest_tile_x" value="61"/> - <property name="dest_tile_y" value="39"/> + <property name="dest_x" value="61"/> + <property name="dest_y" value="39"/> </properties> </object> <object id="11" name="To Lighthouse " type="warp" x="1152" y="1088" width="32" height="32"> <properties> <property name="dest_map" value="023-2"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="38"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="38"/> </properties> </object> <object id="12" name="To Lighthouse " type="warp" x="1184" y="736" width="32" height="32"> <properties> <property name="dest_map" value="023-2"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="33"/> </properties> </object> <object id="13" name="Thug" type="spawn" x="2144" y="1216" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="117"/> </properties> </object> <object id="14" name="Swashbuckler" type="spawn" x="2528" y="960" width="384" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="118"/> </properties> </object> <object id="15" name="Grenadier" type="spawn" x="1760" y="800" width="224" height="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> <object id="16" name="Swashbuckler" type="spawn" x="2400" y="3072" width="384" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="118"/> </properties> </object> <object id="17" name="Grenadier" type="spawn" x="2464" y="3712" width="640" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> <object id="18" name="Thug" type="spawn" x="1664" y="3936" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="117"/> </properties> </object> <object id="19" name="Thug" type="spawn" x="1408" y="2656" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="117"/> </properties> </object> <object id="20" name="Swashbuckler" type="spawn" x="3104" y="2048" width="384" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="118"/> </properties> </object> <object id="21" name="Thug" type="spawn" x="3264" y="2784" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="117"/> </properties> </object> <object id="22" name="Thug" type="spawn" x="1888" y="1824" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="117"/> </properties> </object> <object id="23" name="Grenadier" type="spawn" x="2784" y="1408" width="448" height="384"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="119"/> </properties> </object> <object id="24" name="AngrySeaSlime" type="spawn" x="2048" y="2304" width="32" height="1504"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="150000"/> + <property name="death" value="100000"/> + <property name="spawn" value="150000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="107"/> </properties> </object> <object id="25" name="AngrySeaSlime" type="spawn" x="1376" y="1120" width="192" height="1248"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="150000"/> + <property name="death" value="100000"/> + <property name="spawn" value="150000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="107"/> </properties> @@ -1596,15 +1596,15 @@ <object id="26" name="To Other Side Of Bridge" type="warp" x="2112" y="3168" width="32" height="128"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="61"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="61"/> + <property name="dest_y" value="100"/> </properties> </object> <object id="27" name="To Other Side Of Bridge" type="warp" x="1984" y="3168" width="32" height="128"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="67"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="67"/> + <property name="dest_y" value="100"/> </properties> </object> </objectgroup> diff --git a/maps/023-2.tmx b/maps/023-2.tmx index 41df9f34..c4240dee 100644 --- a/maps/023-2.tmx +++ b/maps/023-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="100" height="100" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="3"> <properties> <property name="Music" value="faith.ogg"/> <property name="Name" value="Lighthouse"/> @@ -8,7 +8,7 @@ <tileset firstgid="3" source="../tilesets/inn.tsx"/> <tileset firstgid="259" source="../tilesets/inn2.tsx"/> <tileset firstgid="515" source="../tilesets/cave2_sewer_mine_x4.tsx"/> - <layer name="Ground1" width="100" height="100"> + <layer id="1" name="Ground1" width="100" height="100"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -112,7 +112,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="100" height="100"> + <layer id="2" name="Ground2" width="100" height="100"> <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, @@ -216,7 +216,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 </data> </layer> - <layer name="Ground3" width="100" height="100"> + <layer id="3" name="Ground3" width="100" height="100"> <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, @@ -320,7 +320,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 </data> </layer> - <layer name="Fringe" width="100" height="100"> + <layer id="4" name="Fringe" width="100" height="100"> <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, @@ -424,7 +424,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 </data> </layer> - <layer name="Over1" width="100" height="100"> + <layer id="5" name="Over1" width="100" height="100"> <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, @@ -528,7 +528,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 </data> </layer> - <layer name="Collision" width="100" height="100"> + <layer id="6" name="Collision" width="100" height="100"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -632,19 +632,19 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Lighthouse Beach" type="warp" x="992" y="1280" width="32" height="32"> + <objectgroup id="7" name="Objects" visible="0"> + <object id="1" name="To Lighthouse Beach" type="warp" x="992" y="1280" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="35"/> </properties> </object> - <object name="To Lighthouse Beach" type="warp" x="992" y="992" width="32" height="32"> + <object id="2" name="To Lighthouse Beach" type="warp" x="992" y="992" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="23"/> </properties> </object> </objectgroup> diff --git a/maps/023-3.tmx b/maps/023-3.tmx index 29769674..2e37e763 100644 --- a/maps/023-3.tmx +++ b/maps/023-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="160" height="170" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="160" height="170" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="15"> <properties> <property name="music" value="peace.ogg"/> <property name="name" value="Tulimshar Beach Caves"/> @@ -10,7 +10,7 @@ <tileset firstgid="387" source="../tilesets/cave2_bilevel_water_lava.tsx"/> <tileset firstgid="643" source="../tilesets/cave2_x2.tsx"/> <tileset firstgid="675" source="../tilesets/cave2_sewer_mine_x4.tsx"/> - <layer name="Ground1" width="160" height="170"> + <layer id="1" name="Ground1" width="160" height="170"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,483,42,42,42,436,531,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,532,437,113,113,113,113,113,113,113,94,130,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,499,113,113,113,452,547,485,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,532,548,453,113,113,113,113,113,113,94,130,23,23,23,23,23,23,23, @@ -184,7 +184,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,112,113,113,113,113,113,419,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="160" height="170"> + <layer id="2" name="Ground2" width="160" height="170"> <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,3,4,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,12,0,0,0,0,0,0,0, @@ -224,7 +224,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,468,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,131,388,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,12,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -300,7 +300,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,552,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,61,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -358,7 +358,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,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="160" height="170"> + <layer id="3" name="Fringe" width="160" height="170"> <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, @@ -398,7 +398,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -474,7 +474,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,647,648,649,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -532,7 +532,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 </data> </layer> - <layer name="Over1" width="160" height="170"> + <layer id="4" name="Over1" width="160" height="170"> <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, @@ -706,7 +706,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 </data> </layer> - <layer name="Collision" width="160" height="170"> + <layer id="5" name="Collision" width="160" height="170" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -880,107 +880,107 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" width="0" height="0" visible="0"> - <object name="To Lighthouse Beach" type="warp" x="2400" y="4288" width="32" height="32"> + <objectgroup id="6" name="Objects" visible="0"> + <object id="1" name="To Lighthouse Beach" type="warp" x="2400" y="4288" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="75"/> - <property name="dest_tile_y" value="136"/> + <property name="dest_x" value="75"/> + <property name="dest_y" value="136"/> </properties> </object> - <object name="To Lighthouse Beach" type="warp" x="2272" y="3744" width="32" height="32"> + <object id="2" name="To Lighthouse Beach" type="warp" x="2272" y="3744" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="71"/> - <property name="dest_tile_y" value="119"/> + <property name="dest_x" value="71"/> + <property name="dest_y" value="119"/> </properties> </object> - <object name="To Lighthouse Beach" type="warp" x="2656" y="3648" width="32" height="32"> + <object id="3" name="To Lighthouse Beach" type="warp" x="2656" y="3648" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="116"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="116"/> </properties> </object> - <object name="To Lighthouse Beach" type="warp" x="3392" y="3840" width="32" height="32"> + <object id="4" name="To Lighthouse Beach" type="warp" x="3392" y="3840" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="107"/> - <property name="dest_tile_y" value="122"/> + <property name="dest_x" value="107"/> + <property name="dest_y" value="122"/> </properties> </object> - <object name="To Lighthouse Beach" type="warp" x="3392" y="3584" width="32" height="32"> + <object id="5" name="To Lighthouse Beach" type="warp" x="3392" y="3584" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="105"/> - <property name="dest_tile_y" value="112"/> + <property name="dest_x" value="105"/> + <property name="dest_y" value="112"/> </properties> </object> - <object name="To Lighthouse Beach" type="warp" x="2240" y="3040" width="32" height="32"> + <object id="6" name="To Lighthouse Beach" type="warp" x="2240" y="3040" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="70"/> - <property name="dest_tile_y" value="97"/> + <property name="dest_x" value="70"/> + <property name="dest_y" value="97"/> </properties> </object> - <object name="To Lighthouse Beach" type="warp" x="1536" y="2560" width="32" height="32"> + <object id="7" name="To Lighthouse Beach" type="warp" x="1536" y="2560" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="82"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="82"/> </properties> </object> - <object name="To Lighthouse Beach" type="warp" x="1952" y="1152" width="32" height="32"> + <object id="8" name="To Lighthouse Beach" type="warp" x="1952" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="61"/> - <property name="dest_tile_y" value="34"/> + <property name="dest_x" value="61"/> + <property name="dest_y" value="34"/> </properties> </object> - <object name="Thug" type="spawn" x="2816" y="2368" width="256" height="256"> + <object id="9" name="Thug" type="spawn" x="2816" y="2368" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="117"/> </properties> </object> - <object name="Swashbuckler" type="spawn" x="3968" y="2624" width="256" height="256"> + <object id="10" name="Swashbuckler" type="spawn" x="3968" y="2624" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="118"/> </properties> </object> - <object name="Swashbuckler" type="spawn" x="3040" y="800" width="256" height="256"> + <object id="11" name="Swashbuckler" type="spawn" x="3040" y="800" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="118"/> </properties> </object> - <object name="Thug" type="spawn" x="3744" y="1344" width="256" height="256"> + <object id="12" name="Thug" type="spawn" x="3744" y="1344" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="117"/> </properties> </object> - <object name="Swashbuckler" type="spawn" x="1440" y="3360" width="416" height="192"> + <object id="13" name="Swashbuckler" type="spawn" x="1440" y="3360" width="416" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="118"/> </properties> </object> - <object name="Thug" type="spawn" x="1152" y="1536" width="2144" height="288"> + <object id="14" name="Thug" type="spawn" x="1152" y="1536" width="2144" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="117"/> </properties> diff --git a/maps/025-1.tmx b/maps/025-1.tmx index efb79fbd..fa3ad2e5 100644 --- a/maps/025-1.tmx +++ b/maps/025-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="20"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="20"> <properties> <property name="minimap" value="graphics/minimaps/025-1.png"/> <property name="music" value="mystique-forest.ogg"/> @@ -765,100 +765,100 @@ <object id="1" name="To Swamp" type="warp" x="608" y="2112" width="32" height="32"> <properties> <property name="dest_map" value="026-1"/> - <property name="dest_tile_x" value="128"/> - <property name="dest_tile_y" value="66"/> + <property name="dest_x" value="128"/> + <property name="dest_y" value="66"/> </properties> </object> <object id="2" name="To Woodland" type="warp" x="2816" y="608" width="128" height="32"> <properties> <property name="dest_map" value="015-1"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="100"/> </properties> </object> <object id="3" name="To Woodland" type="warp" x="4160" y="1824" width="32" height="96"> <properties> <property name="dest_map" value="016-1"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="53"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="53"/> </properties> </object> <object id="4" name="CloverPatch" type="spawn" x="2304" y="672" width="1824" height="2560"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="10000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="35"/> </properties> </object> <object id="5" name="CloverPatch" type="spawn" x="1600" y="3008" width="448" height="192"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="1200000"/> + <property name="death" value="10000"/> + <property name="spawn" value="1200000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> </properties> </object> <object id="6" name="AlizarinPlant" type="spawn" x="576" y="608" width="2496" height="1088"> <properties> - <property name="eA_death" value="12000"/> - <property name="eA_spawn" value="240000"/> + <property name="death" value="12000"/> + <property name="spawn" value="240000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="30"/> </properties> </object> <object id="8" name="Silkworm" type="spawn" x="640" y="2208" width="1216" height="1024"> <properties> - <property name="eA_death" value="300"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="300"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="18"/> <property name="monster_id" value="33"/> </properties> </object> <object id="9" name="LogHead" type="spawn" x="2080" y="640" width="2048" height="1792"> <properties> - <property name="eA_death" value="3000"/> - <property name="eA_spawn" value="18000"/> + <property name="death" value="3000"/> + <property name="spawn" value="18000"/> <property name="max_beings" value="14"/> <property name="monster_id" value="23"/> </properties> </object> <object id="10" name="PinkFlower" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="5000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="5000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="34"/> <property name="monster_id" value="12"/> </properties> </object> <object id="14" name="GrassSnake" type="spawn" x="768" y="2336" width="1152" height="864"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="32"/> </properties> </object> <object id="15" name="GrassSnake" type="spawn" x="2144" y="1024" width="768" height="928"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="32"/> </properties> </object> <object id="16" name="GrassSnake" type="spawn" x="1728" y="2432" width="1248" height="544"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="32"/> </properties> </object> <object id="17" name="GrassSnake" type="spawn" x="768" y="800" width="1920" height="576"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="32"/> </properties> diff --git a/maps/025-3.tmx b/maps/025-3.tmx index c267f8ea..18f25021 100644 --- a/maps/025-3.tmx +++ b/maps/025-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="190" height="190" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="190" height="190" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="13"> <properties> <property name="music" value="night-is-calling.ogg"/> <property name="name" value="Rossy Main Hall"/> @@ -9,7 +9,7 @@ <tileset firstgid="131" source="../tilesets/cave_x2.tsx"/> <tileset firstgid="147" source="../tilesets/cave_bilevel.tsx"/> <tileset firstgid="403" source="../tilesets/arena.tsx"/> - <layer name="Ground1" width="190" height="190"> + <layer id="1" name="Ground1" width="190" height="190"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -203,7 +203,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,112,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113 </data> </layer> - <layer name="Ground2" width="190" height="190"> + <layer id="2" name="Ground2" width="190" height="190"> <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, @@ -397,7 +397,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 </data> </layer> - <layer name="Fringe" width="190" height="190"> + <layer id="3" name="Fringe" width="190" height="190"> <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, @@ -591,7 +591,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 </data> </layer> - <layer name="Over1" width="190" height="190"> + <layer id="4" name="Over1" width="190" height="190"> <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, @@ -785,7 +785,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 </data> </layer> - <layer name="Collision" width="190" height="190"> + <layer id="5" name="Collision" width="190" height="190"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -979,51 +979,51 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2304" y="2912" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2528" y="2912" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3392" y="2816" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1728" y="3520" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2400" y="2848" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="2432" y="2848" width="32" height="32"/> - <object name="To Woodland Swamp" type="warp" x="3552" y="3136" width="96" height="32"> + <objectgroup id="6" name="Objects" visible="0"> + <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2304" y="2912" width="32" height="32"/> + <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2528" y="2912" width="32" height="32"/> + <object id="3" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3392" y="2816" width="32" height="32"/> + <object id="4" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1728" y="3520" width="32" height="32"/> + <object id="5" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2400" y="2848" width="32" height="32"/> + <object id="6" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2432" y="2848" width="32" height="32"/> + <object id="7" name="To Woodland Swamp" type="warp" x="3552" y="3136" width="96" height="32"> <properties> <property name="dest_map" value="025-1"/> - <property name="dest_tile_x" value="42"/> - <property name="dest_tile_y" value="81"/> + <property name="dest_x" value="42"/> + <property name="dest_y" value="81"/> </properties> </object> - <object name="To Clauquer's Cave" type="warp" x="3360" y="2752" width="32" height="32"> + <object id="8" name="To Clauquer's Cave" type="warp" x="3360" y="2752" width="32" height="32"> <properties> <property name="dest_map" value="025-4"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="36"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="36"/> </properties> </object> - <object name="CaveMaggot" type="spawn" x="0" y="0"> + <object id="9" name="CaveMaggot" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="100"/> <property name="monster_id" value="54"/> </properties> </object> - <object name="Archant" type="spawn" x="0" y="0"> + <object id="10" name="Archant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="20"/> <property name="monster_id" value="58"/> </properties> </object> - <object name="AngryScorpion" type="spawn" x="0" y="0"> + <object id="11" name="AngryScorpion" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="25"/> <property name="monster_id" value="55"/> </properties> </object> - <object name="Skeleton" type="spawn" x="2016" y="4896" width="448" height="64"> + <object id="12" name="Skeleton" type="spawn" x="2016" y="4896" width="448" height="64"> <properties> - <property name="eA_death" value="30000"/> + <property name="death" value="30000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="41"/> </properties> diff --git a/maps/025-4.tmx b/maps/025-4.tmx index 50ecad36..3172c9d3 100644 --- a/maps/025-4.tmx +++ b/maps/025-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="200" height="240" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="240" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="32"> <properties> <property name="music" value="night-is-calling.ogg"/> <property name="name" value="Rossy Battle Caves"/> @@ -41,24 +41,24 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,42,37,53,71,72,7,7,54,55,89,90,91,55,56,7,7,68,52,58,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,29,30,30,31,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,53,74,74,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,58,53,69,7,7,7,7,70,71,105,106,107,71,72,7,7,7,68,74,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,29,30,30,31,7,7,126,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,37,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,20,23,21,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,74,69,7,7,7,7,7,13,14,14,14,14,14,15,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,45,46,46,47,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,54,36,39,37,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,29,30,30,30,30,30,31,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,121,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,123,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,7,7,7,7,70,52,55,53,75,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,121,7,7,7,7,45,46,46,46,46,46,47,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,69,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,126,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,123,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,121,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,123,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,22,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,6,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,6,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,123,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,29,30,30,30,30,30,31,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,121,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,123,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,7,7,7,7,70,52,55,53,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,121,7,7,7,7,45,46,46,46,46,46,47,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,69,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,126,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,123,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,121,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,123,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,123,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,7,7,7,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -75,7 +75,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,42,42,42,42,42,42,42,42,42,42,42,42,42,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,89,90,91,58,58,64,65,66,58,58,58,58,58,36,39,39,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,58,58,58,58,89,90,91,58,58,58,58,58,36,39,39,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,42,42,42,37,53,74,105,106,107,74,74,80,81,82,74,74,74,74,74,52,55,55,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,42,42,37,53,74,74,74,74,74,74,105,106,107,74,74,74,74,74,52,55,55,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,58,58,58,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,71,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,71,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,74,74,74,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,20,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,71,71,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,74,74,74,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,53,74,74,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,42,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,126,7,96,97,98,7,7,7,7,7,7,7,7,7,7,7,7,7,7,54,36,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,37,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,54,58,58,36,39,39,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,112,113,110,98,7,7,7,7,7,7,7,7,7,7,7,7,7,70,52,58,36,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,70,74,74,52,55,55,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,96,111,113,113,110,98,7,7,7,7,7,7,7,7,7,7,7,7,7,68,74,52,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -205,7 +205,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,40,7,7,6,23,23,23,23,23,23,7,7,7,7,7,7,7,7,7,7,7,7,23,24,7,7,7,7,7,7,7,38,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,42,42,42,42,20,23,23,23,23,23,21,42,42,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,89,90,91,36,37,55,36,42,43,23,23,21,37,58,36,39,39,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,56,126,7,22,23,7,7,23,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,8,7,7,7,54,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,58,58,36,20,23,23,23,21,37,58,58,58,36,39,39,42,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,53,105,106,107,52,53,71,52,58,59,23,41,37,53,74,52,55,55,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,72,7,7,22,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,41,39,40,7,7,7,70,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,42,42,37,53,74,74,74,74,52,36,43,23,41,37,53,74,74,74,52,55,55,58,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,37,53,69,7,7,7,68,69,7,68,74,75,23,57,53,69,7,68,71,71,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, -23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,40,7,7,7,38,42,42,43,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,57,55,56,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,53,69,7,7,7,7,68,52,59,23,57,53,69,7,7,7,68,71,71,74,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,38,20,73,69,7,7,7,7,7,38,20,23,23,23,87,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, +23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,40,7,7,7,38,42,42,43,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,57,55,56,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,58,58,53,69,7,7,7,7,68,52,59,23,57,53,69,7,7,7,68,71,71,74,75,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,38,20,73,69,7,7,7,7,7,38,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,56,7,7,7,54,55,58,59,23,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,73,71,72,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,37,53,74,74,69,7,7,7,7,121,7,68,75,23,73,69,7,7,7,7,7,109,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,69,7,7,109,7,7,7,7,7,123,7,54,36,40,7,126,7,7,7,7,54,36,42,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,72,7,7,7,70,71,74,75,23,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,23,24,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,37,53,69,123,7,7,7,7,7,7,7,7,7,22,23,24,7,7,7,7,7,7,7,7,7,38,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,123,7,7,7,7,7,7,70,52,56,7,7,7,7,7,121,70,52,58,36,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,22,23,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,23,24,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,53,69,7,7,7,7,7,7,7,7,7,7,7,38,39,40,7,7,7,123,7,7,7,7,7,54,36,42,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,68,72,7,7,7,7,123,7,7,68,74,52,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -1247,20 +1247,20 @@ <object id="15" name="To Rossy Main Hall" type="warp" x="896" y="1184" width="32" height="32"> <properties> <property name="dest_map" value="025-3"/> - <property name="dest_tile_x" value="105"/> - <property name="dest_tile_y" value="87"/> + <property name="dest_x" value="105"/> + <property name="dest_y" value="87"/> </properties> </object> <object id="16" name="CaveMaggot" type="spawn" x="608" y="768" width="672" height="480"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="3"/> <property name="monster_id" value="54"/> </properties> </object> <object id="17" name="CaveMaggot" type="spawn" x="2688" y="448" width="672" height="704"> <properties> - <property name="eA_death" value="100"/> + <property name="death" value="100"/> <property name="max_beings" value="5"/> <property name="monster_id" value="54"/> </properties> diff --git a/maps/026-1.tmx b/maps/026-1.tmx index 0152e4ae..b1cdaed1 100644 --- a/maps/026-1.tmx +++ b/maps/026-1.tmx @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="34"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="34"> <properties> <property name="minimap" value="graphics/minimaps/026-1.png"/> - <property name="music" value="graveyard.ogg"/> + <property name="music" value="DrearyDay.ogg"/> <property name="name" value="Asphodel Moor"/> <property name="overlay0image" value="graphics/images/ambient/fog.png"/> <property name="overlay0parallax" value="1.0"/> @@ -120,10 +120,10 @@ 35,35,3,51,19,67,627,663,710,629,35,35,3,51,19,3,51,51,19,67,19,3,675,663,646,660,660,661,35,35,643,710,629,51,19,51,19,51,19,67,51,19,67,691,644,645,3,51,19,3,51,51,19,707,709,3,51,3,51,19,51,19,67,19,3,627,663,644,644,644,646,661,35,675,628,663,644,644,644,694,708,695,693,51,19,35,1044,1045,1045,1045,1048,1026,1027,3,51,19,3,51,19,3,51,51,19,67,19,3,51,3,51,19,67,67,627,628,629,3,3,51,3,51,67,67,67,35,67,3,19,35,35,51,19,19,3,35,19,35,19,19,19,35,35,3,67,67,19,67,35,35,19,51, 51,19,51,19,3,51,643,644,644,710,629,19,67,35,3,35,35,3,35,35,3,675,663,646,661,3,3,51,51,19,659,695,645,35,3,51,3,51,19,19,3,51,19,691,644,693,35,35,3,35,35,3,35,35,3,35,35,35,35,3,3,35,35,3,627,663,644,644,646,660,661,51,19,659,647,644,696,644,694,709,51,707,709,3,35,1025,1047,1045,1045,1045,1045,1045,1048,1027,35,3,35,35,3,35,67,35,35,35,3,35,35,35,627,628,629,67,643,646,661,3,67,3,67,19,67,67,35,19,19,19,3,19,19,3,19,3,3,51,67,3,67,67,35,19,3,19,35,35,51,67,19,3,3,67, 35,3,35,3,35,627,663,644,644,644,710,629,3,19,67,51,19,67,51,19,67,659,660,661,19,67,35,35,3,35,35,643,710,629,67,35,35,35,3,3,35,35,3,691,644,645,51,19,67,51,19,67,51,19,67,51,19,51,19,67,67,51,19,67,659,660,647,644,645,51,19,51,19,3,643,644,712,713,645,51,3,3,35,3,35,1063,1066,1045,1045,1045,1045,1045,1067,1065,19,67,51,19,67,67,35,35,51,19,67,51,19,51,643,644,710,628,663,645,67,3,3,3,51,51,19,19,35,3,3,43,44,3,3,67,35,67,35,51,3,3,67,67,3,67,35,67,3,67,51,19,3,3,19,35, -19,67,19,67,51,643,644,644,644,712,644,645,67,51,19,51,627,628,629,19,3,51,19,3,51,19,51,19,67,51,19,659,695,710,629,19,51,19,67,627,629,19,67,707,695,710,676,677,19,51,19,3,51,19,3,51,19,3,51,19,3,51,19,3,51,627,663,646,661,35,3,35,3,627,663,644,644,644,645,3,35,19,35,3,35,51,1063,1064,1066,1045,1045,1045,1046,3,51,19,3,51,19,67,35,19,51,19,3,51,19,3,659,660,647,644,644,710,628,629,3,3,67,67,67,19,51,51,19,51,19,19,67,35,35,51,35,67,3,67,35,35,67,67,35,67,3,35,67,3,19,67,51,67, +19,67,19,67,51,643,644,644,644,0,644,645,67,51,19,51,627,628,629,19,3,51,19,3,51,19,51,19,67,51,19,659,695,710,629,19,51,19,67,627,629,19,67,707,695,710,676,677,19,51,19,3,51,19,3,51,19,3,51,19,3,51,19,3,51,627,663,646,661,35,3,35,3,627,663,644,644,644,645,3,35,19,35,3,35,51,1063,1064,1066,1045,1045,1045,1046,3,51,19,3,51,19,67,35,19,51,19,3,51,19,3,659,660,647,644,644,710,628,629,3,3,67,67,67,19,51,51,19,51,19,19,67,35,35,51,35,67,3,67,35,35,67,67,35,67,3,35,67,3,19,67,51,67, 51,19,3,51,19,659,647,644,712,696,644,710,629,35,3,35,643,644,662,629,35,35,3,35,35,3,3,51,19,3,51,51,643,644,645,3,51,3,627,663,645,3,51,19,691,644,692,662,677,35,3,35,35,3,35,35,3,35,35,3,35,35,3,35,35,659,647,645,51,19,67,627,628,663,644,644,644,644,710,677,3,35,67,35,3,1270,3,35,1044,1045,1045,1067,1065,35,35,3,35,35,3,51,19,35,35,3,35,35,3,35,35,3,659,647,644,646,660,661,19,3,51,67,3,3,19,35,3,3,3,51,3,51,3,19,51,51,3,35,3,67,51,67,3,35,51,67,19,3,19,3,3,19, 35,3,51,19,3,35,643,644,644,644,644,644,662,629,3,627,663,644,644,710,629,19,67,51,19,67,35,35,3,35,35,3,659,695,710,677,35,35,643,646,661,35,35,3,659,660,695,644,693,19,3,51,19,67,51,19,67,627,628,677,51,19,67,51,19,627,663,645,3,3,51,707,708,695,644,644,644,644,644,662,677,19,51,19,67,19,3,51,1063,1066,1067,1065,67,51,19,67,51,19,67,19,3,51,19,67,51,19,67,51,19,67,3,659,660,661,19,51,67,3,67,67,67,3,19,35,35,3,19,35,67,67,19,67,19,19,19,3,51,19,35,35,35,35,67,3,3,35,35,67,35,51, -19,35,35,3,67,3,659,660,647,644,644,644,644,645,3,643,644,644,694,695,662,677,19,3,51,19,51,19,67,51,19,67,51,659,644,645,19,627,663,645,3,51,19,51,19,3,707,708,709,19,35,35,3,3,51,19,627,663,694,709,35,3,3,51,19,659,660,661,35,35,35,3,51,691,644,644,694,708,695,694,709,3,3,3,51,19,35,35,3,1063,1065,19,627,629,51,19,3,3,51,19,35,35,3,3,51,19,19,3,51,19,35,3,3,67,19,51,19,67,51,19,3,51,51,3,3,51,51,3,67,3,3,19,51,67,19,67,67,19,67,35,3,19,51,3,19,67,67,67,3,67, +19,35,35,3,67,3,659,660,647,644,644,644,712,645,3,643,644,644,694,695,662,677,19,3,51,19,51,19,67,51,19,67,51,659,644,645,19,627,663,645,3,51,19,51,19,3,707,708,709,19,35,35,3,3,51,19,627,663,694,709,35,3,3,51,19,659,660,661,35,35,35,3,51,691,644,644,694,708,695,694,709,3,3,3,51,19,35,35,3,1063,1065,19,627,629,51,19,3,3,51,19,35,35,3,3,51,19,19,3,51,19,35,3,3,67,19,51,19,67,51,19,3,51,51,3,3,51,51,3,67,3,3,19,51,67,19,67,67,19,67,35,3,19,51,3,19,67,67,67,3,67, 51,51,19,67,3,35,35,3,659,660,647,644,644,662,628,663,694,708,709,707,695,693,3,35,35,3,3,51,1270,51,19,3,51,19,695,710,628,663,646,661,35,35,3,35,3,35,35,35,35,3,51,19,67,35,627,628,663,694,709,3,19,67,35,35,3,3,35,35,3,51,19,51,627,711,644,694,709,51,707,709,19,67,35,35,35,67,51,19,67,35,675,677,643,662,628,677,35,35,35,3,51,19,67,35,35,3,3,35,35,3,35,67,67,51,67,67,67,3,3,3,67,67,3,35,35,19,35,51,35,35,67,3,67,67,19,19,67,19,35,35,3,19,51,3,35,51,67,3,35,67, 35,3,35,35,3,51,19,67,35,35,659,647,644,644,644,644,693,3,51,19,707,709,19,51,19,67,35,35,3,35,3,35,35,3,659,695,646,660,661,3,51,19,67,19,67,51,3,51,19,51,19,3,51,19,659,647,644,710,629,67,3,51,19,3,51,19,51,19,35,35,3,627,711,694,708,709,35,35,3,35,67,67,67,3,35,19,19,19,51,19,691,710,711,644,644,645,3,51,19,51,19,3,51,19,3,51,19,51,19,67,19,3,19,67,19,35,67,3,67,67,3,19,3,35,67,19,3,67,67,3,3,35,19,19,19,19,35,35,19,3,19,35,67,67,51,19,19,67,35,51, 19,67,51,19,35,35,3,51,19,51,19,643,644,644,644,644,710,677,35,3,19,35,3,35,35,3,51,19,67,19,3,51,19,67,51,659,661,51,19,67,3,51,19,3,51,19,35,35,3,35,3,35,35,3,35,659,647,646,661,3,35,35,1270,35,35,3,35,35,51,19,67,707,708,709,19,67,51,19,19,67,51,51,35,35,19,3,35,35,35,3,691,644,644,644,644,710,629,35,3,35,3,35,35,3,35,35,3,35,35,3,67,3,67,35,35,35,19,3,19,19,59,60,3,35,19,35,3,67,3,3,19,3,67,19,35,19,35,67,51,19,35,3,19,35,67,67,51,35,19,67, @@ -509,7 +509,7 @@ 0,0,0,0,0,0,0,293,294,0,0,0,0,0,582,583,584,0,293,294,0,0,0,0,0,0,0,275,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,906,907,908,269,0,0,0,0,0,597,598,269,0,0,0,0,0,0,0,0,0,0,278,279,0,0,0,0,0,0,0,0,0,0,585,586,587,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,585,586,587,0,582,583,584,0,0,291,292,0,579,580,581,0,0,579,580,581,0,582,583,584,0,0,0,295,296,0,0,293,294, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,291,292,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,597,598,0,293,294,0,583,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,295,296,0,0,0,0,583,584,0,0,0,579,580,581,55,293,294,295,296, 0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,585,586,587,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,597,598,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,579,580,581,278,279,0,0,0,0,0,0,0,0,0,0,0,585,586,587,0,0,0,293,294,291,292,0,0,0,0,0,291,292,293,294,0,295,296,0,0,0,579,580,581,0,0,0,579,580,581,0,582,583,584,579,580,581,0,0,0,0,0,0,293, -580,581,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,295,296,0,0,263,0,0,0,0,0,0,0,0,0,597,598,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,278,279,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,0,0,293,294,0,0,293,294,0,0,0,0,0,293,294,582,583,584,0,582,583,584,291,292,0,0,291,292,0,0, +580,581,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,295,296,0,0,0,0,0,0,0,0,0,0,0,0,597,598,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,291,292,0,0,0,0,278,279,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,0,0,293,294,0,0,293,294,0,0,0,0,0,293,294,582,583,584,0,582,583,584,291,292,0,0,291,292,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,585,586,587,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,276,277,0,293,294,0,0,0,280,281,0,0,0,0,269,0,0,0,0,0,0,0,0,582,583,584,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,311,312,0,0,0,0,291,292,0,0,0,0,886,887,0,0,0,0,295,296,291,292,0,0,0,0,0,0,55,0,295,296,0,0,291,292,0,0,291,292,0,0,0,582,583,584,0,0,0,0,579,580,581,293,294,293, 0,0,0,0,0,0,0,0,0,0,321,322,0,0,0,0,276,277,0,0,0,0,0,0,0,597,598,0,886,887,888,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,886,887,888,0,0,0,0,0,0,0,0,0,597,598,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,585,586,587,0,0,0,291,292,0,896,897,0,0,0,295,296,0,0,0,0,0,295,296,579,580,581,0,0,0,0,0,0,293,294,0,0,0,55,0,0,0,0,0,293,294,0,0,0,0,585,586,587,0, 0,293,294,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,897,898,0,0,273,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,896,897,898,0,293,294,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,595,596,0,0,0,0,0,579,580,581,907,0,0,295,296,291,292,0,295,296,0,0,295,296,0,0,293,294,0,0,0,295,296,0,55,0,0,0,0,579,580,581,293,294,0,291,292,0,0,0,0,293,294, @@ -891,7 +891,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 </data> </layer> - <layer id="8" name="Collision" width="150" height="120" visible="0"> + <layer id="8" name="Collision" width="150" height="120"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1019,53 +1019,53 @@ <object id="1" name="To Graveyard" type="warp" x="2016" y="512" width="32" height="32"> <properties> <property name="dest_map" value="027-1"/> - <property name="dest_tile_x" value="63"/> - <property name="dest_tile_y" value="105"/> + <property name="dest_x" value="63"/> + <property name="dest_y" value="105"/> </properties> </object> <object id="2" name="To Woodland Swamp" type="warp" x="4128" y="2112" width="32" height="32"> <properties> <property name="dest_map" value="025-1"/> - <property name="dest_tile_x" value="20"/> - <property name="dest_tile_y" value="66"/> + <property name="dest_x" value="20"/> + <property name="dest_y" value="66"/> </properties> </object> <object id="3" name="Wisp" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="40000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="34"/> <property name="monster_id" value="38"/> </properties> </object> <object id="4" name="Spectre" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="40000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="34"/> <property name="monster_id" value="40"/> </properties> </object> <object id="5" name="Poltergeist" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="40000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="34"/> <property name="monster_id" value="45"/> </properties> </object> <object id="6" name="Silkworm" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="300000"/> + <property name="death" value="60000"/> + <property name="spawn" value="300000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="33"/> </properties> </object> <object id="8" name="LogHead" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="300000"/> + <property name="death" value="40000"/> + <property name="spawn" value="300000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="23"/> </properties> @@ -1073,54 +1073,54 @@ <object id="19" name="To Reid's Inn" type="warp" x="1536" y="1248" width="32" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="33"/> </properties> </object> <object id="20" name="DrunkenSkeleton" type="spawn" x="672" y="768" width="1824" height="480"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="75"/> </properties> </object> <object id="21" name="TipsySkeleton" type="spawn" x="768" y="832" width="1696" height="384"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="76"/> </properties> </object> <object id="22" name="DrunkenSkeleton" type="spawn" x="736" y="1984" width="2150" height="992"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="75"/> </properties> </object> <object id="23" name="TipsySkeleton" type="spawn" x="896" y="2112" width="1930" height="770"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="76"/> </properties> </object> <object id="24" name="DrunkenSkeleton" type="spawn" x="3040" y="704" width="1024" height="2400"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="75"/> </properties> </object> <object id="25" name="TipsySkeleton" type="spawn" x="3072" y="768" width="928" height="2304"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="76"/> </properties> @@ -1128,37 +1128,37 @@ <object id="28" name="To Shops" type="warp" x="1376" y="768" width="32" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="128"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="128"/> </properties> </object> <object id="29" name="To House" type="warp" x="800" y="640" width="32" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="22"/> - <property name="dest_tile_y" value="95"/> + <property name="dest_x" value="22"/> + <property name="dest_y" value="95"/> </properties> </object> <object id="31" name="DrunkenLadySkeleton" type="spawn" x="3040" y="704" width="1024" height="2400"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="77"/> </properties> </object> <object id="32" name="DrunkenLadySkeleton" type="spawn" x="736" y="2016" width="2240" height="1056"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="77"/> </properties> </object> <object id="33" name="DrunkenLadySkeleton" type="spawn" x="672" y="800" width="1760" height="416"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="77"/> </properties> diff --git a/maps/026-2.tmx b/maps/026-2.tmx index 75a461a9..49cd0861 100644 --- a/maps/026-2.tmx +++ b/maps/026-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="106" height="157" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="37"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="106" height="157" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="37"> <properties> <property name="music" value="inquisitive-inn.ogg"/> <property name="name" value="Swamp Indoors"/> @@ -1140,78 +1140,78 @@ <object id="20" name="To Outside" type="warp" x="896" y="1120" width="128" height="32"> <properties> <property name="dest_map" value="026-1"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="40"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="40"/> </properties> </object> <object id="21" name="To Second Floor" type="warp" x="704" y="800" width="64" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="66"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="66"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="22" name="To First Floor" type="warp" x="2080" y="832" width="64" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="23"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="23"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="23" name="To First Floor" type="warp" x="800" y="1760" width="64" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="23"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="23"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="24" name="To Kitchen" type="warp" x="704" y="1056" width="64" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="26"/> - <property name="dest_tile_y" value="56"/> + <property name="dest_x" value="26"/> + <property name="dest_y" value="56"/> </properties> </object> <object id="29" name="To Outside" type="warp" x="704" y="3072" width="32" height="32"> <properties> <property name="dest_map" value="026-1"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="30" name="To Second Floor" type="warp" x="1280" y="2624" width="64" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="95"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="95"/> </properties> </object> <object id="32" name="To First Floor" type="warp" x="2656" y="3072" width="64" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="41"/> - <property name="dest_tile_y" value="83"/> + <property name="dest_x" value="41"/> + <property name="dest_y" value="83"/> </properties> </object> <object id="33" name="To Golbenez" type="warp" x="736" y="1856" width="32" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="81"/> - <property name="dest_tile_y" value="57"/> + <property name="dest_x" value="81"/> + <property name="dest_y" value="57"/> </properties> </object> <object id="34" name="To Reid's Inn" type="warp" x="2624" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="026-2"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="58"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="58"/> </properties> </object> <object id="35" name="To Outside" type="warp" x="992" y="4128" width="32" height="32"> <properties> <property name="dest_map" value="026-1"/> - <property name="dest_tile_x" value="43"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="43"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="36" name="Alchemy" type="node" x="1120" y="3744" width="32" height="32"/> diff --git a/maps/027-1.tmx b/maps/027-1.tmx index 19eb9e61..d5ab79da 100644 --- a/maps/027-1.tmx +++ b/maps/027-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="23"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="23"> <properties> <property name="minimap" value="graphics/minimaps/027-1.png"/> <property name="music" value="graveyard.ogg"/> @@ -1024,157 +1024,157 @@ <object id="1" name="To Caretaker's House" type="warp" x="2816" y="2688" width="32" height="32"> <properties> <property name="dest_map" value="027-2"/> - <property name="dest_tile_x" value="46"/> - <property name="dest_tile_y" value="33"/> + <property name="dest_x" value="46"/> + <property name="dest_y" value="33"/> </properties> </object> <object id="2" name="To Swamp" type="warp" x="2016" y="3392" width="32" height="32"> <properties> <property name="dest_map" value="026-1"/> - <property name="dest_tile_x" value="63"/> - <property name="dest_tile_y" value="17"/> + <property name="dest_x" value="63"/> + <property name="dest_y" value="17"/> </properties> </object> <object id="3" name="Poltergeist" type="spawn" x="1088" y="2496" width="3072" height="896"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="900000"/> + <property name="death" value="60000"/> + <property name="spawn" value="900000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="45"/> </properties> </object> <object id="4" name="Spectre" type="spawn" x="1056" y="2528" width="3136" height="832"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="900000"/> + <property name="death" value="60000"/> + <property name="spawn" value="900000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="40"/> </properties> </object> <object id="5" name="Wisp" type="spawn" x="1024" y="2560" width="3200" height="768"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="900000"/> + <property name="death" value="60000"/> + <property name="spawn" value="900000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="38"/> </properties> </object> <object id="6" name="Skeleton" type="spawn" x="672" y="1744" width="1080" height="688"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="41"/> </properties> </object> <object id="7" name="LadySkeleton" type="spawn" x="672" y="1744" width="1064" height="696"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="42"/> </properties> </object> <object id="8" name="Skeleton" type="spawn" x="1792" y="960" width="1024" height="736"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="175000"/> + <property name="death" value="20000"/> + <property name="spawn" value="175000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="41"/> </properties> </object> <object id="9" name="LadySkeleton" type="spawn" x="1792" y="960" width="1024" height="736"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="175000"/> + <property name="death" value="20000"/> + <property name="spawn" value="175000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="42"/> </properties> </object> <object id="10" name="Skeleton" type="spawn" x="672" y="960" width="1088" height="736"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="180000"/> + <property name="death" value="20000"/> + <property name="spawn" value="180000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="41"/> </properties> </object> <object id="11" name="LadySkeleton" type="spawn" x="672" y="960" width="1088" height="736"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="180000"/> + <property name="death" value="20000"/> + <property name="spawn" value="180000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="42"/> </properties> </object> <object id="12" name="Skeleton" type="spawn" x="2848" y="960" width="1056" height="704"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="35000"/> + <property name="death" value="20000"/> + <property name="spawn" value="35000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="41"/> </properties> </object> <object id="13" name="LadySkeleton" type="spawn" x="2848" y="960" width="1056" height="704"> <properties> - <property name="eA_death" value="25000"/> - <property name="eA_spawn" value="33000"/> + <property name="death" value="25000"/> + <property name="spawn" value="33000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="42"/> </properties> </object> <object id="14" name="Skeleton" type="spawn" x="1784" y="1728" width="1024" height="688"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="41"/> </properties> </object> <object id="15" name="LadySkeleton" type="spawn" x="1784" y="1728" width="1024" height="704"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="42"/> </properties> </object> <object id="16" name="Skeleton" type="spawn" x="2872" y="1736" width="1024" height="688"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="41"/> </properties> </object> <object id="17" name="LadySkeleton" type="spawn" x="2872" y="1736" width="1024" height="704"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="42"/> </properties> </object> <object id="18" name="VampireBat" type="spawn" x="664" y="973" width="3249" height="703"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="64"/> </properties> </object> <object id="21" name="Jack O" type="spawn" x="864" y="2154" width="96" height="64"> <properties> - <property name="eA_death" value="200000"/> - <property name="eA_spawn" value="265000"/> + <property name="death" value="200000"/> + <property name="spawn" value="265000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="20"/> </properties> </object> <object id="22" name="Zombie" type="spawn" x="1792" y="960" width="1024" height="736"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="300000"/> + <property name="death" value="120000"/> + <property name="spawn" value="300000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="34"/> </properties> diff --git a/maps/027-2.tmx b/maps/027-2.tmx index 9bbcbc0d..d095ce60 100644 --- a/maps/027-2.tmx +++ b/maps/027-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="73" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="18"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="73" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="18"> <properties> <property name="music" value="inquisitive-inn.ogg"/> <property name="name" value="Graveyard Indoor"/> @@ -952,8 +952,8 @@ <objectgroup id="8" name="Objects" visible="0"> <object id="5" name="TipsySkeleton" type="spawn" x="672" y="2880" width="320" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="76"/> </properties> @@ -961,37 +961,37 @@ <object id="11" name="To Graveyard" type="warp" x="1056" y="3552" width="192" height="32"> <properties> <property name="dest_map" value="027-1"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="68"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="68"/> </properties> </object> <object id="12" name="To Crypts Basement" type="warp" x="1056" y="2496" width="192" height="32"> <properties> <property name="dest_map" value="027-3"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="68"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="68"/> </properties> </object> <object id="13" name="VampireBat" type="spawn" x="673" y="2219" width="945" height="1287"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="64"/> </properties> </object> <object id="14" name="DrunkenSkeleton" type="spawn" x="672" y="2880" width="320" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="75"/> </properties> </object> <object id="15" name="TipsySkeleton" type="spawn" x="672" y="2880" width="320" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="76"/> </properties> @@ -999,8 +999,8 @@ <object id="17" name="To Graveyard" type="warp" x="1472" y="1088" width="32" height="32"> <properties> <property name="dest_map" value="027-1"/> - <property name="dest_tile_x" value="88"/> - <property name="dest_tile_y" value="85"/> + <property name="dest_x" value="88"/> + <property name="dest_y" value="85"/> </properties> </object> </objectgroup> diff --git a/maps/027-3.tmx b/maps/027-3.tmx index bca0a8f4..9ab713a2 100644 --- a/maps/027-3.tmx +++ b/maps/027-3.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="12"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="12"> <properties> - <property name="music" value="graveyard.ogg"/> + <property name="music" value="OverwhelmedUnderground.ogg"/> <property name="name" value="Crypt Basement"/> <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/> <property name="overlay0keepratio" value="true"/> @@ -921,77 +921,77 @@ <object id="1" name="To Crypts Entrance" type="warp" x="768" y="2144" width="128" height="32"> <properties> <property name="dest_map" value="027-2"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="77"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="77"/> </properties> </object> <object id="2" name="To Crypts Sub-Basement One" type="warp" x="4000" y="3167" width="125" height="33"> <properties> <property name="dest_map" value="027-4"/> - <property name="dest_tile_x" value="125"/> - <property name="dest_tile_y" value="18"/> + <property name="dest_x" value="125"/> + <property name="dest_y" value="18"/> </properties> </object> <object id="3" name="Skeleton" type="spawn" x="670" y="940" width="965" height="2259"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="41"/> </properties> </object> <object id="4" name="Skeleton" type="spawn" x="2180" y="920" width="1949" height="1001"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="41"/> </properties> </object> <object id="5" name="LadySkeleton" type="spawn" x="664" y="936" width="972" height="2259"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="42"/> </properties> </object> <object id="6" name="LadySkeleton" type="spawn" x="3192" y="2096" width="928" height="888"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="42"/> </properties> </object> <object id="7" name="Skeleton" type="spawn" x="3206" y="2090" width="909" height="897"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="41"/> </properties> </object> <object id="8" name="VampireBat" type="spawn" x="2170" y="2435" width="960" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="64"/> </properties> </object> <object id="9" name="PoisonSkull" type="spawn" x="672" y="928" width="3424" height="1088"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="20000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="22"/> </properties> </object> <object id="10" name="FireSkull" type="spawn" x="2176" y="2464" width="1952" height="480"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="20000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="21"/> </properties> diff --git a/maps/027-4.tmx b/maps/027-4.tmx index 8ceeafc6..0cb3f30b 100644 --- a/maps/027-4.tmx +++ b/maps/027-4.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="10"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="10"> <properties> - <property name="music" value="graveyard.ogg"/> + <property name="music" value="OverwhelmedUnderground.ogg"/> <property name="name" value="Crypt Sub-Basement One"/> <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/> <property name="overlay0keepratio" value="true"/> @@ -920,53 +920,53 @@ <object id="1" name="To Crypts Basement" type="warp" x="3936" y="544" width="160" height="33"> <properties> <property name="dest_map" value="027-3"/> - <property name="dest_tile_x" value="125"/> - <property name="dest_tile_y" value="98"/> + <property name="dest_x" value="125"/> + <property name="dest_y" value="98"/> </properties> </object> <object id="2" name="To Crypts Sub-Basement Two" type="warp" x="640" y="3136" width="128" height="32"> <properties> <property name="dest_map" value="027-5"/> - <property name="dest_tile_x" value="124"/> - <property name="dest_tile_y" value="18"/> + <property name="dest_x" value="124"/> + <property name="dest_y" value="18"/> </properties> </object> <object id="3" name="Skeleton" type="spawn" x="640" y="2336" width="1248" height="736"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="41"/> </properties> </object> <object id="4" name="LadySkeleton" type="spawn" x="640" y="1472" width="512" height="736"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="42"/> </properties> </object> <object id="5" name="Skeleton" type="spawn" x="2848" y="2240" width="1280" height="480"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="41"/> </properties> </object> <object id="6" name="LadySkeleton" type="spawn" x="1344" y="704" width="1248" height="992"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="42"/> </properties> </object> <object id="7" name="LadySkeleton" type="spawn" x="2624" y="672" width="1248" height="992"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="42"/> </properties> diff --git a/maps/027-5.tmx b/maps/027-5.tmx index 83f8a455..4d5171c3 100644 --- a/maps/027-5.tmx +++ b/maps/027-5.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="10"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="10"> <properties> - <property name="music" value="graveyard.ogg"/> + <property name="music" value="OverwhelmedUnderground.ogg"/> <property name="name" value="Crypt Sub-Basement Two"/> <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/> <property name="overlay0keepratio" value="true"/> @@ -1049,62 +1049,62 @@ <object id="1" name="To Crypts Sub-Basement Two" type="warp" x="3936" y="544" width="169" height="34"> <properties> <property name="dest_map" value="027-4"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="97"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="97"/> </properties> </object> <object id="2" name="Wight" type="spawn" x="686" y="716" width="3136" height="1344"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="122"/> </properties> </object> <object id="3" name="VampireBat" type="spawn" x="688" y="717" width="3145" height="2271"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="30"/> <property name="monster_id" value="64"/> </properties> </object> <object id="4" name="Skeleton" type="spawn" x="650" y="712" width="3168" height="1312"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="41"/> </properties> </object> <object id="5" name="LadySkeleton" type="spawn" x="656" y="732" width="3168" height="1280"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="42"/> </properties> </object> <object id="6" name="RedBone" type="spawn" x="656" y="732" width="3136" height="1312"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="72"/> </properties> </object> <object id="7" name="Skeleton" type="spawn" x="672" y="2016" width="3168" height="1120"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="41"/> </properties> </object> <object id="8" name="LadySkeleton" type="spawn" x="640" y="1984" width="3200" height="1184"> <properties> - <property name="eA_death" value="8000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="8000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="42"/> </properties> diff --git a/maps/027-6.tmx b/maps/027-6.tmx index 3145f68e..7dd65479 100644 --- a/maps/027-6.tmx +++ b/maps/027-6.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="80" height="85" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="80" height="85" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="2"> <properties> - <property name="music" value="graveyard.ogg"/> + <property name="music" value="OverwhelmedUnderground.ogg"/> <property name="name" value="Crypt Sub-Basement Two"/> <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/> <property name="overlay0keepratio" value="true"/> @@ -13,7 +13,7 @@ <tileset firstgid="739" source="../tilesets/crypt_fringe_x3.tsx"/> <tileset firstgid="819" source="../tilesets/crypt_fringe2_x3.tsx"/> <tileset firstgid="899" source="../tilesets/crypt_x4.tsx"/> - <layer name="Ground" width="80" height="85"> + <layer id="1" name="Ground" width="80" height="85"> <data encoding="csv"> 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701, 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701, @@ -102,7 +102,7 @@ 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701 </data> </layer> - <layer name="Ground2" width="80" height="85"> + <layer id="2" name="Ground2" width="80" height="85"> <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, @@ -191,7 +191,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 name="Ground3" width="80" height="85"> + <layer id="3" name="Ground3" width="80" height="85"> <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, @@ -280,7 +280,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 name="Fringe" width="80" height="85"> + <layer id="4" name="Fringe" width="80" height="85"> <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, @@ -369,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 </data> </layer> - <layer name="Over" width="80" height="85"> + <layer id="5" name="Over" width="80" height="85"> <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, @@ -458,7 +458,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 name="Over2" width="80" height="85"> + <layer id="6" name="Over2" width="80" height="85"> <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, @@ -547,7 +547,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 name="Over3" width="80" height="85"> + <layer id="7" name="Over3" width="80" height="85"> <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, @@ -636,7 +636,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 name="Collision" width="80" height="85"> + <layer id="8" name="Collision" width="80" height="85"> <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, @@ -725,7 +725,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> - <objectgroup name="Objects" width="80" height="85" visible="0"> - <object name="graphics/particles/warparea.particle.xml" type="particle_effect" x="1152" y="1952" width="224" height="32"/> + <objectgroup id="9" name="Objects" visible="0"> + <object id="1" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="1152" y="1952" width="224" height="32"/> </objectgroup> </map> diff --git a/maps/027-7.tmx b/maps/027-7.tmx index 06e9bf6a..fade67d4 100644 --- a/maps/027-7.tmx +++ b/maps/027-7.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="80" height="85" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="80" height="85" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="2"> <properties> - <property name="music" value="graveyard.ogg"/> + <property name="music" value="OverwhelmedUnderground.ogg"/> <property name="name" value="Crypt Sub-Basement Two"/> <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/> <property name="overlay0keepratio" value="true"/> @@ -14,7 +14,7 @@ <tileset firstgid="819" source="../tilesets/crypt_fringe2_x3.tsx"/> <tileset firstgid="899" source="../tilesets/crypt_x4.tsx"/> <tileset firstgid="963" source="../tilesets/crypt2_x4.tsx"/> - <layer name="Ground" width="80" height="85"> + <layer id="1" name="Ground" width="80" height="85"> <data encoding="csv"> 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701, 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701, @@ -103,7 +103,7 @@ 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701 </data> </layer> - <layer name="Ground2" width="80" height="85"> + <layer id="2" name="Ground2" width="80" height="85"> <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, @@ -192,7 +192,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 name="Ground3" width="80" height="85"> + <layer id="3" name="Ground3" width="80" height="85"> <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, @@ -281,7 +281,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 name="Fringe" width="80" height="85"> + <layer id="4" name="Fringe" width="80" height="85"> <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, @@ -370,7 +370,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 name="Over" width="80" height="85"> + <layer id="5" name="Over" width="80" height="85"> <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, @@ -459,7 +459,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 name="Over2" width="80" height="85"> + <layer id="6" name="Over2" width="80" height="85"> <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, @@ -548,7 +548,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 name="Collision" width="80" height="85"> + <layer id="7" name="Collision" width="80" height="85"> <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, @@ -637,7 +637,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> - <objectgroup name="Objects" width="80" height="85" visible="0"> - <object name="graphics/particles/warparea.particle.xml" type="particle_effect" x="1152" y="1952" width="224" height="32"/> + <objectgroup id="8" name="Objects" visible="0"> + <object id="1" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="1152" y="1952" width="224" height="32"/> </objectgroup> </map> diff --git a/maps/027-8.tmx b/maps/027-8.tmx index bfb71e96..8339acb3 100644 --- a/maps/027-8.tmx +++ b/maps/027-8.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="80" height="85" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="80" height="85" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="2"> <properties> - <property name="music" value="graveyard.ogg"/> + <property name="music" value="OverwhelmedUnderground.ogg"/> <property name="name" value="Crypt Sub-Basement Two"/> <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/> <property name="overlay0keepratio" value="true"/> @@ -13,7 +13,7 @@ <tileset firstgid="739" source="../tilesets/crypt_fringe_x3.tsx"/> <tileset firstgid="819" source="../tilesets/crypt_fringe2_x3.tsx"/> <tileset firstgid="899" source="../tilesets/crypt_x4.tsx"/> - <layer name="Ground" width="80" height="85"> + <layer id="1" name="Ground" width="80" height="85"> <data encoding="csv"> 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701, 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701, @@ -102,7 +102,7 @@ 701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701,701 </data> </layer> - <layer name="Ground2" width="80" height="85"> + <layer id="2" name="Ground2" width="80" height="85"> <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, @@ -191,7 +191,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 name="Fringe" width="80" height="85"> + <layer id="3" name="Fringe" width="80" height="85"> <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, @@ -280,7 +280,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 name="Over" width="80" height="85"> + <layer id="4" name="Over" width="80" height="85"> <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, @@ -369,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 </data> </layer> - <layer name="Over2" width="80" height="85"> + <layer id="5" name="Over2" width="80" height="85"> <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, @@ -458,7 +458,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 name="Collision" width="80" height="85"> + <layer id="6" name="Collision" width="80" height="85"> <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, @@ -547,7 +547,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> - <objectgroup draworder="topdown" name="Objects" width="80" height="85" visible="0"> - <object name="graphics/particles/warparea.particle.xml" type="particle_effect" x="1216" y="1952" width="96" height="32"/> + <objectgroup id="7" name="Objects" visible="0"> + <object id="1" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="1216" y="1952" width="96" height="32"/> </objectgroup> </map> diff --git a/maps/028-1.tmx b/maps/028-1.tmx index b933d135..176f3e9e 100644 --- a/maps/028-1.tmx +++ b/maps/028-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="159" height="158" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="15"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="159" height="158" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="15"> <properties> <property name="music" value="mystique-forest.ogg"/> <property name="name" value="GM Island"/> @@ -1158,8 +1158,8 @@ <object id="13" name="To GM Island Cave" type="warp" x="3840" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="028-3"/> - <property name="dest_tile_x" value="33"/> - <property name="dest_tile_y" value="77"/> + <property name="dest_x" value="33"/> + <property name="dest_y" value="77"/> </properties> </object> <object id="14" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="3136" y="1184" width="32" height="32"/> diff --git a/maps/028-3.tmx b/maps/028-3.tmx index 0c380cbb..06ddde38 100644 --- a/maps/028-3.tmx +++ b/maps/028-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="7"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="7"> <properties> <property name="music" value="night-is-calling.ogg"/> <property name="name" value="GM Island Cave"/> @@ -9,8 +9,7 @@ <tileset firstgid="131" source="../tilesets/cave_x2.tsx"/> <tileset firstgid="147" source="../tilesets/cave_bilevel.tsx"/> <tileset firstgid="403" source="../tilesets/mushrooms_x2.tsx"/> - <tileset firstgid="543" source="../tilesets/mushrooms_x2.tsx"/> - <tileset firstgid="603" source="../tilesets/mushrooms_x3.tsx"/> + <tileset firstgid="528" source="../tilesets/mushrooms_x3.tsx"/> <layer id="1" name="Ground1" width="100" height="100"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,112,113,113,114,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -141,7 +140,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,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,603,604,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,528,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -150,7 +149,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,526,0,0,0,0,0,0,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,423,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,423,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,525,0,0,0,0,0,0,0,0,0,0,0,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,527,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -432,8 +431,8 @@ <object id="6" name="To GM Island" type="warp" x="1056" y="2496" width="32" height="32"> <properties> <property name="dest_map" value="028-1"/> - <property name="dest_tile_x" value="120"/> - <property name="dest_tile_y" value="126"/> + <property name="dest_x" value="120"/> + <property name="dest_y" value="126"/> </properties> </object> </objectgroup> diff --git a/maps/029-1.tmx b/maps/029-1.tmx index 4ed08b7c..89bb6ba7 100644 --- a/maps/029-1.tmx +++ b/maps/029-1.tmx @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextobjectid="14"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="14"> <properties> <property name="minimap" value="graphics/minimaps/029-1.png"/> - <property name="music" value="the-forest.ogg"/> + <property name="music" value="In my Heart.ogg"/> <property name="name" value="Candor Island"/> <property name="overlay0image" value="graphics/images/ambient/clouds.png"/> <property name="overlay0parallax" value="1.0"/> @@ -26,7 +26,7 @@ <tileset firstgid="1344" name="npcs" tilewidth="50" tileheight="80" tilecount="42" columns="14"> <image source="../graphics/sprites/npcs/2006__npcs.png" width="700" height="240"/> </tileset> - <layer name="Ground1" width="140" height="140"> + <layer id="1" name="Ground1" width="140" height="140"> <data encoding="csv"> 459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459, 459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459, @@ -170,7 +170,7 @@ 459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,468,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459,459 </data> </layer> - <layer name="Ground2" width="140" height="140"> + <layer id="2" name="Ground2" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -314,7 +314,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 </data> </layer> - <layer name="Ground3" width="140" height="140"> + <layer id="3" name="Ground3" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -458,7 +458,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 </data> </layer> - <layer name="Ground4" width="140" height="140"> + <layer id="4" name="Ground4" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -602,7 +602,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 </data> </layer> - <layer name="Fringe" width="140" height="140"> + <layer id="5" name="Fringe" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -746,7 +746,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 </data> </layer> - <layer name="Over1" width="140" height="140"> + <layer id="6" name="Over1" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -890,7 +890,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 </data> </layer> - <layer name="Over2" width="140" height="140"> + <layer id="7" name="Over2" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1034,7 +1034,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 </data> </layer> - <layer name="Over3" width="140" height="140"> + <layer id="8" name="Over3" width="140" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1178,7 +1178,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 </data> </layer> - <layer name="Collision" width="140" height="140"> + <layer id="9" name="Collision" width="140" height="140"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1322,43 +1322,43 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="10" name="Objects" visible="0"> <object id="1" name="CloverPatch" type="spawn" x="1416" y="1543" width="180" height="93"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="120000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> </properties> </object> <object id="2" name="Maggot" type="spawn" x="2112" y="2784" width="480" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="0"/> </properties> </object> <object id="3" name="TameScorpion" type="spawn" x="2656" y="960" width="512" height="384"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="16"/> <property name="monster_id" value="44"/> </properties> </object> <object id="4" name="TameScorpion" type="spawn" x="2656" y="2912" width="704" height="608"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="44"/> </properties> </object> <object id="5" name="Scorpion" type="spawn" x="896" y="1024" width="1024" height="768"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="1"/> </properties> @@ -1366,34 +1366,34 @@ <object id="6" name="To Valon's House" type="warp" x="1280" y="2816" width="32" height="32"> <properties> <property name="dest_map" value="029-2"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="7" name="To Storeroom" type="warp" x="1408" y="2656" width="32" height="32"> <properties> <property name="dest_map" value="029-2"/> - <property name="dest_tile_x" value="22"/> - <property name="dest_tile_y" value="92"/> + <property name="dest_x" value="22"/> + <property name="dest_y" value="92"/> </properties> </object> <object id="8" name="To The Magic Shack" type="warp" x="1664" y="2688" width="32" height="32"> <properties> <property name="dest_map" value="029-2"/> - <property name="dest_tile_x" value="103"/> - <property name="dest_tile_y" value="61"/> + <property name="dest_x" value="103"/> + <property name="dest_y" value="61"/> </properties> </object> <object id="9" name="To Two Arms" type="warp" x="1856" y="2528" width="32" height="32"> <properties> <property name="dest_map" value="029-2"/> - <property name="dest_tile_x" value="94"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="94"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="10" name="ManaBug" type="spawn" x="1600" y="960" width="1696" height="832"> <properties> - <property name="eA_spawn" value="30"/> + <property name="spawn" value="30"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1131"/> </properties> @@ -1403,8 +1403,8 @@ <object id="13" name="To The Bank" type="warp" x="1568" y="2464" width="32" height="32"> <properties> <property name="dest_map" value="029-2"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="123"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="123"/> </properties> </object> </objectgroup> diff --git a/maps/029-2.tmx b/maps/029-2.tmx index b6121d60..b5e25dc5 100644 --- a/maps/029-2.tmx +++ b/maps/029-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="140" height="142" tilewidth="32" tileheight="32" nextobjectid="12"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="142" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="12"> <properties> <property name="music" value="peace.ogg"/> <property name="name" value="Candor Island Indoor"/> @@ -14,7 +14,7 @@ <tileset firstgid="911" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="959" source="../tilesets/woodland_indoor_x3.tsx"/> <tileset firstgid="1007" source="../tilesets/arrows.tsx"/> - <layer name="Ground1" width="140" height="142"> + <layer id="1" name="Ground1" width="140" height="142"> <properties> <property name="Mask" value="1"/> </properties> @@ -163,7 +163,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="140" height="142"> + <layer id="2" name="Ground2" width="140" height="142"> <properties> <property name="Mask" value="1"/> </properties> @@ -312,7 +312,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Mask_Outside" width="140" height="142"> + <layer id="3" name="Mask_Outside" width="140" height="142"> <properties> <property name="Mask" value="2"/> </properties> @@ -461,7 +461,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 </data> </layer> - <layer name="Mask_Exit" width="140" height="142"> + <layer id="4" name="Mask_Exit" width="140" height="142"> <properties> <property name="Mask" value="8"/> </properties> @@ -610,7 +610,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 </data> </layer> - <layer name="Mask_Carpet" width="140" height="142"> + <layer id="5" name="Mask_Carpet" width="140" height="142"> <properties> <property name="Mask" value="4"/> </properties> @@ -759,7 +759,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 </data> </layer> - <layer name="Mask_Dresser2" width="140" height="142"> + <layer id="6" name="Mask_Dresser2" width="140" height="142"> <properties> <property name="Mask" value="32"/> </properties> @@ -908,7 +908,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 </data> </layer> - <layer name="Mask_Dresser" width="140" height="142"> + <layer id="7" name="Mask_Dresser" width="140" height="142"> <properties> <property name="Mask" value="16"/> </properties> @@ -1057,7 +1057,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 </data> </layer> - <layer name="Ground3" width="140" height="142"> + <layer id="8" name="Ground3" width="140" height="142"> <properties> <property name="Mask" value="1"/> </properties> @@ -1206,7 +1206,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 </data> </layer> - <layer name="Fringe" width="140" height="142"> + <layer id="9" name="Fringe" width="140" height="142"> <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, @@ -1352,7 +1352,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 </data> </layer> - <layer name="Over1" width="140" height="142"> + <layer id="10" name="Over1" width="140" height="142"> <properties> <property name="Mask" value="1"/> </properties> @@ -1501,7 +1501,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Collision" width="140" height="142" visible="0"> + <layer id="11" name="Collision" width="140" height="142" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1647,26 +1647,26 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="12" name="Objects"> <object id="1" name="To Outside" type="warp" x="928" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="029-1"/> - <property name="dest_tile_x" value="40"/> - <property name="dest_tile_y" value="89"/> + <property name="dest_x" value="40"/> + <property name="dest_y" value="89"/> </properties> </object> <object id="2" name="To Outside" type="warp" x="704" y="2976" width="32" height="32"> <properties> <property name="dest_map" value="029-1"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="84"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="84"/> </properties> </object> <object id="3" name="To Bedroom" type="warp" x="3584" y="2688" width="32" height="32"> <properties> <property name="dest_map" value="029-2"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="4" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="1408" y="992" width="32" height="32"/> @@ -1674,14 +1674,14 @@ <object id="6" name="To Outside" type="warp" x="3296" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="029-1"/> - <property name="dest_tile_x" value="52"/> - <property name="dest_tile_y" value="85"/> + <property name="dest_x" value="52"/> + <property name="dest_y" value="85"/> </properties> </object> <object id="7" name="HouseMaggot" type="spawn" x="672" y="1728" width="800" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="48"/> </properties> @@ -1689,15 +1689,15 @@ <object id="8" name="To Outside" type="warp" x="3008" y="992" width="32" height="32"> <properties> <property name="dest_map" value="029-1"/> - <property name="dest_tile_x" value="58"/> - <property name="dest_tile_y" value="80"/> + <property name="dest_x" value="58"/> + <property name="dest_y" value="80"/> </properties> </object> <object id="9" name="To Outside" type="warp" x="768" y="3968" width="32" height="32"> <properties> <property name="dest_map" value="029-1"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="78"/> </properties> </object> <object id="10" name="Alchemy" type="node" x="3616" y="1824" width="32" height="32"/> diff --git a/maps/029-3.tmx b/maps/029-3.tmx index ae7e535a..2cd9fffa 100644 --- a/maps/029-3.tmx +++ b/maps/029-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" nextobjectid="1"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="1"> <properties> <property name="minimap" value="graphics/minimaps/029-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -8,7 +8,7 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/cave.tsx"/> <tileset firstgid="131" source="../tilesets/arena.tsx"/> - <layer name="Ground1" width="100" height="100"> + <layer id="1" name="Ground1" width="100" height="100"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -112,7 +112,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="100" height="100"> + <layer id="2" name="Ground2" width="100" height="100"> <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, @@ -216,7 +216,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 </data> </layer> - <layer name="Fringe" width="100" height="100"> + <layer id="3" name="Fringe" width="100" height="100"> <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, @@ -320,7 +320,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 </data> </layer> - <layer name="Over1" width="100" height="100"> + <layer id="4" name="Over1" width="100" height="100"> <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, @@ -424,7 +424,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 </data> </layer> - <layer name="Collision" width="100" height="100"> + <layer id="5" name="Collision" width="100" height="100"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, diff --git a/maps/029-4.tmx b/maps/029-4.tmx index 7bcbc2f3..a4d94c4c 100644 --- a/maps/029-4.tmx +++ b/maps/029-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextobjectid="8"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="8"> <properties> <property name="minimap" value="graphics/minimaps/029-4.png"/> <property name="music" value="the-forest.ogg"/> @@ -16,7 +16,7 @@ <tileset firstgid="323" name="npcs" tilewidth="50" tileheight="80" tilecount="42" columns="14"> <image source="../graphics/sprites/npcs/2006__npcs.png" width="700" height="240"/> </tileset> - <layer name="Ground1" width="100" height="100"> + <layer id="1" name="Ground1" width="100" height="100"> <data encoding="csv"> 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, @@ -120,7 +120,7 @@ 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89 </data> </layer> - <layer name="Ground2" width="100" height="100"> + <layer id="2" name="Ground2" width="100" height="100"> <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, @@ -224,7 +224,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 </data> </layer> - <layer name="Fringe" width="100" height="100"> + <layer id="3" name="Fringe" width="100" height="100"> <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, @@ -328,7 +328,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 </data> </layer> - <layer name="Over1" width="100" height="100"> + <layer id="4" name="Over1" width="100" height="100"> <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, @@ -432,7 +432,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 </data> </layer> - <layer name="Collision" width="100" height="100"> + <layer id="5" name="Collision" width="100" height="100"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -536,51 +536,51 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="6" name="Objects"> <object id="1" name="EvilMushroom" type="spawn" x="2016" y="1888" width="416" height="448"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="60000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="11"/> </properties> </object> <object id="2" name="Squirrel" type="spawn" x="832" y="864" width="416" height="448"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="60000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="36"/> </properties> </object> <object id="3" name="CloverPatch" type="spawn" x="1416" y="1543" width="180" height="93"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="120000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> </properties> </object> <object id="4" name="SpikyMushroom" type="spawn" x="832" y="1600" width="736" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="30000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="17"/> </properties> </object> <object id="5" name="Bat" type="spawn" x="1472" y="864" width="576" height="608"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="25000"/> + <property name="death" value="30000"/> + <property name="spawn" value="25000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="15"/> </properties> </object> <object id="6" name="LogHead" type="spawn" x="1696" y="1504" width="448" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="25000"/> + <property name="death" value="30000"/> + <property name="spawn" value="25000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="23"/> </properties> @@ -588,8 +588,8 @@ <object id="7" name="To Exit" type="warp" x="704" y="1184" width="32" height="64"> <properties> <property name="dest_map" value="029-1"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="38"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="38"/> </properties> </object> </objectgroup> diff --git a/maps/030-1.tmx b/maps/030-1.tmx index 7503eecd..0f95d08f 100644 --- a/maps/030-1.tmx +++ b/maps/030-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" infinite="0" nextobjectid="8"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="8"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Romantic Place"/> @@ -22,7 +22,7 @@ <tileset firstgid="868" name="npcs" tilewidth="50" tileheight="80" tilecount="42" columns="14"> <image source="../graphics/sprites/npcs/2006__npcs.png" width="700" height="240"/> </tileset> - <layer name="Ground1" width="138" height="128"> + <layer id="1" name="Ground1" width="138" height="128"> <data encoding="csv"> 544,544,544,544,588,555,556,552,552,565,566,567,552,552,552,553,564,599,599,599,599,562,539,552,538,564,580,559,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,70,86,70,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,546,599,550,541,541,541,541,541,543,543,544,544,544,544,588,555,555,555,555, 555,555,555,555,555,576,567,552,552,552,552,552,552,552,538,564,599,580,558,558,581,599,562,563,564,580,559,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,70,70,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,535,536,592,599,551,543,544,544,544,544,544,588,555,555,555,555,555,555,555,555,555, @@ -154,7 +154,7 @@ 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,599,535,592,540,550,543,588,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555 </data> </layer> - <layer name="Ground2" width="138" height="128"> + <layer id="2" name="Ground2" width="138" height="128"> <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,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,148,148,148,148,148,148,148,148,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,119,11,9,121,0,0,0,0,0,0,0,0,0,147,134,164,165,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,180,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,148,148,148,148,148,148,148,148,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,119,121,0,0,0,0,0,0,0,0,0,0,147,149,196,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -286,7 +286,7 @@ 0,0,0,0,0,0,0,0,195,179,163,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,132,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="138" height="128"> + <layer id="3" name="Fringe" width="138" height="128"> <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,131,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -418,7 +418,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,275,0,0,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,0,276,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="138" height="128"> + <layer id="4" name="Over1" width="138" height="128"> <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, @@ -550,7 +550,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 </data> </layer> - <layer name="Over2" width="138" height="128"> + <layer id="5" name="Over2" width="138" height="128"> <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,131,132,132,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -682,7 +682,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 </data> </layer> - <layer name="Collision" width="138" height="128"> + <layer id="6" name="Collision" width="138" height="128"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -814,42 +814,42 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Present" type="warp" x="1888" y="864" width="128" height="32"> <properties> <property name="dest_map" value="019-1"/> - <property name="dest_tile_x" value="101"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="101"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="2" name="Pollett" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="111"/> </properties> </object> <object id="4" name="WhiteBell" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="93"/> </properties> </object> <object id="5" name="Santaboo" type="spawn" x="2272" y="2144"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="1112"/> </properties> </object> <object id="6" name="Reinboo" type="spawn" x="2272" y="2144"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="92"/> </properties> diff --git a/maps/030-2.tmx b/maps/030-2.tmx index 988dbae1..4902eed0 100644 --- a/maps/030-2.tmx +++ b/maps/030-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="220" height="130" tilewidth="32" tileheight="32" nextobjectid="17"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="220" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="17"> <properties> <property name="music" value="white-christmas.ogg"/> <property name="name" value="Christmas Inn"/> @@ -10,7 +10,7 @@ <tileset firstgid="515" source="../tilesets/inn_x2.tsx"/> <tileset firstgid="563" source="../tilesets/inn_x3.tsx"/> <tileset firstgid="643" source="../tilesets/inn_x4.tsx"/> - <layer name="Ground1" width="220" height="130"> + <layer id="1" name="Ground1" width="220" height="130"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -144,7 +144,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="220" height="130"> + <layer id="2" name="Ground2" width="220" height="130"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -278,7 +278,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground3" width="220" height="130"> + <layer id="3" name="Ground3" width="220" height="130"> <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, @@ -412,7 +412,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 </data> </layer> - <layer name="Ground4" width="220" height="130"> + <layer id="4" name="Ground4" width="220" height="130"> <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, @@ -546,7 +546,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 </data> </layer> - <layer name="Fringe" width="220" height="130"> + <layer id="5" name="Fringe" width="220" height="130"> <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, @@ -680,7 +680,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 </data> </layer> - <layer name="Over1" width="220" height="130"> + <layer id="6" name="Over1" width="220" height="130"> <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, @@ -814,7 +814,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 </data> </layer> - <layer name="Over2" width="220" height="130"> + <layer id="7" name="Over2" width="220" height="130"> <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, @@ -948,7 +948,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 </data> </layer> - <layer name="Collision" width="220" height="130"> + <layer id="8" name="Collision" width="220" height="130"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1082,111 +1082,111 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="9" name="Objects"> <object id="1" name="To Outside" type="warp" x="2816" y="1632" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="33"/> - <property name="dest_tile_y" value="94"/> + <property name="dest_x" value="33"/> + <property name="dest_y" value="94"/> </properties> </object> <object id="2" name="To Basement" type="warp" x="2304" y="992" width="32" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="51"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="51"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="3" name="To Fourth Floor" type="warp" x="6208" y="2176" width="32" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="88"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="88"/> </properties> </object> <object id="4" name="To First Floor" type="warp" x="1664" y="992" width="32" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="73"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="73"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="5" name="To Second Floor" type="warp" x="2368" y="608" width="64" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="127"/> - <property name="dest_tile_y" value="50"/> + <property name="dest_x" value="127"/> + <property name="dest_y" value="50"/> </properties> </object> <object id="6" name="To Second Floor" type="warp" x="3232" y="608" width="64" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="153"/> - <property name="dest_tile_y" value="50"/> + <property name="dest_x" value="153"/> + <property name="dest_y" value="50"/> </properties> </object> <object id="7" name="To First Floor" type="warp" x="4032" y="1632" width="64" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="75"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="75"/> + <property name="dest_y" value="20"/> </properties> </object> <object id="8" name="To First Floor" type="warp" x="4896" y="1632" width="64" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="101"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="101"/> + <property name="dest_y" value="20"/> </properties> </object> <object id="9" name="To Third Floor" type="warp" x="4992" y="736" width="32" height="64"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="21"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="21"/> + <property name="dest_y" value="78"/> </properties> </object> <object id="10" name="To Second Floor" type="warp" x="640" y="2464" width="32" height="64"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="155"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="155"/> + <property name="dest_y" value="24"/> </properties> </object> <object id="11" name="To Fourth Floor" type="warp" x="1312" y="3360" width="64" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="93"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="93"/> + <property name="dest_y" value="74"/> </properties> </object> <object id="12" name="To Third Floor" type="warp" x="2976" y="2336" width="64" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="41"/> - <property name="dest_tile_y" value="104"/> + <property name="dest_x" value="41"/> + <property name="dest_y" value="104"/> </properties> </object> <object id="13" name="To Fifth Floor" type="warp" x="3232" y="2336" width="64" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="127"/> - <property name="dest_tile_y" value="104"/> + <property name="dest_x" value="127"/> + <property name="dest_y" value="104"/> </properties> </object> <object id="14" name="To Fourth Floor" type="warp" x="4032" y="3360" width="64" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="102"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="102"/> + <property name="dest_y" value="74"/> </properties> </object> <object id="15" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="2816" y="704" width="32" height="32"/> <object id="16" name="To Private Room" type="warp" x="2496" y="2784" width="32" height="32"> <properties> <property name="dest_map" value="030-2"/> - <property name="dest_tile_x" value="194"/> - <property name="dest_tile_y" value="67"/> + <property name="dest_x" value="194"/> + <property name="dest_y" value="67"/> </properties> </object> </objectgroup> diff --git a/maps/030-3.tmx b/maps/030-3.tmx index 750065ba..9f4e15ee 100644 --- a/maps/030-3.tmx +++ b/maps/030-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.2.1" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="2"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="2"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="The Frozen Lake"/> @@ -670,8 +670,8 @@ <object id="1" name="To Snow Cave" type="warp" x="1728" y="2208" width="32" height="32"> <properties> <property name="dest_map" value="019-3"/> - <property name="dest_tile_x" value="80"/> - <property name="dest_tile_y" value="102"/> + <property name="dest_x" value="80"/> + <property name="dest_y" value="102"/> </properties> </object> </objectgroup> diff --git a/maps/030-4.tmx b/maps/030-4.tmx index 2be06bc3..9ab1e12e 100644 --- a/maps/030-4.tmx +++ b/maps/030-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="70" height="70" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1"> <properties> <property name="music" value="white-christmas.ogg"/> <property name="name" value="Christmas Inn Warehouse"/> @@ -8,9 +8,9 @@ <tileset firstgid="3" source="../tilesets/inn.tsx"/> <tileset firstgid="259" source="../tilesets/inn2.tsx"/> <tileset firstgid="515" source="../tilesets/inn_x2.tsx"/> - <tileset firstgid="547" source="../tilesets/inn_x3.tsx"/> - <tileset firstgid="595" source="../tilesets/inn_x4.tsx"/> - <layer name="Ground1" width="70" height="70"> + <tileset firstgid="563" source="../tilesets/inn_x3.tsx"/> + <tileset firstgid="643" source="../tilesets/inn_x4.tsx"/> + <layer id="1" name="Ground1" width="70" height="70"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -84,7 +84,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="70" height="70"> + <layer id="2" name="Ground2" 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, @@ -158,7 +158,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 name="Fringe" width="70" height="70"> + <layer id="3" 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, @@ -184,10 +184,10 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,524,525,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,158,0,0,0,0,0,0,0,524,525,0,158,0,291,292,293,0,0,291,292,293,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,174,0,0,0,0,0,0,0,0,0,0,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,596,595,596,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,643,644,645,646,643,644,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,293,0,0,291,292,293,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,598,595,596,597,598,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,645,646,643,644,645,646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -195,11 +195,11 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,524,525,0,0,0,0,158,0,0,0,0,0,0,0,0,0,0,158,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,0,0,0,0,0,0,0,174,0,0,0,0,0,0,0,0,0,0,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,567,568,0,0,565,566,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,583,584,0,0,581,582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,565,568,0,0,567,568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,584,0,0,583,584,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -232,7 +232,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 name="Over1" width="70" height="70"> + <layer id="4" name="Over1" 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, @@ -306,7 +306,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 name="Over2" width="70" height="70"> + <layer id="5" name="Over2" 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, @@ -380,7 +380,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 name="Collision" width="70" height="70"> + <layer id="6" name="Collision" width="70" 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, @@ -454,5 +454,5 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"/> + <objectgroup id="7" name="Objects" visible="0"/> </map> diff --git a/maps/031-1.tmx b/maps/031-1.tmx index 50034935..5ba03d14 100644 --- a/maps/031-1.tmx +++ b/maps/031-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="128" height="148" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="8"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="128" height="148" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="8"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Nivalis Port"/> @@ -1240,29 +1240,29 @@ <object id="1" name="To Nivalis" type="warp" x="1184" y="1760" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> - <property name="dest_tile_x" value="106"/> - <property name="dest_tile_y" value="55"/> + <property name="dest_x" value="106"/> + <property name="dest_y" value="55"/> </properties> </object> <object id="2" name="To Ice Labyrinth" type="warp" x="2432" y="768" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="212"/> - <property name="dest_tile_y" value="299"/> + <property name="dest_x" value="212"/> + <property name="dest_y" value="299"/> </properties> </object> <object id="3" name="Fluffy" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="18"/> </properties> </object> <object id="4" name="Pollett" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="14"/> <property name="monster_id" value="111"/> </properties> @@ -1270,22 +1270,22 @@ <object id="5" name="To Nivalis Storage" type="warp" x="2880" y="3680" width="32" height="32"> <properties> <property name="dest_map" value="031-2"/> - <property name="dest_tile_x" value="73"/> - <property name="dest_tile_y" value="29"/> + <property name="dest_x" value="73"/> + <property name="dest_y" value="29"/> </properties> </object> <object id="6" name="WhiteSlime" type="spawn" x="2272" y="768" width="352" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="7" name="WhiteBell" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="93"/> </properties> diff --git a/maps/031-2.tmx b/maps/031-2.tmx index c707b618..50d5830e 100644 --- a/maps/031-2.tmx +++ b/maps/031-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="100" height="50" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="50" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="4"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Angela's House"/> @@ -8,8 +8,8 @@ <tileset firstgid="3" source="../tilesets/inn.tsx"/> <tileset firstgid="259" source="../tilesets/inn2.tsx"/> <tileset firstgid="515" source="../tilesets/inn_x2.tsx"/> - <tileset firstgid="547" source="../tilesets/inn_x3.tsx"/> - <layer name="Ground1" width="100" height="50"> + <tileset firstgid="563" source="../tilesets/inn_x3.tsx"/> + <layer id="1" name="Ground1" width="100" height="50"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -63,7 +63,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="100" height="50"> + <layer id="2" name="Ground2" width="100" height="50"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -117,7 +117,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground3" width="100" height="50"> + <layer id="3" name="Ground3" width="100" height="50"> <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, @@ -171,7 +171,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 </data> </layer> - <layer name="Fringe" width="100" height="50"> + <layer id="4" name="Fringe" width="100" height="50"> <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, @@ -201,8 +201,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,16,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,13,13,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,29,29,30,73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,547,0,0,0,0,521,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,227,228,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,243,244,0,0,0,0,0,0,549,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,521,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,227,228,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,243,244,0,0,0,0,0,0,565,566,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -225,7 +225,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 </data> </layer> - <layer name="Over1" width="100" height="50"> + <layer id="5" name="Over1" width="100" height="50"> <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, @@ -279,7 +279,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 </data> </layer> - <layer name="Collision" width="100" height="50"> + <layer id="6" name="Collision" width="100" height="50"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -333,20 +333,20 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="To Outside" type="warp" x="736" y="960" width="32" height="32"> + <objectgroup id="7" name="Objects" visible="0"> + <object id="1" name="To Outside" type="warp" x="736" y="960" width="32" height="32"> <properties> <property name="dest_map" value="031-1"/> - <property name="dest_tile_x" value="95"/> - <property name="dest_tile_y" value="81"/> + <property name="dest_x" value="95"/> + <property name="dest_y" value="81"/> </properties> </object> - <object name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="768" y="736" width="32" height="32"/> - <object name="To Outside" type="warp" x="2336" y="960" width="32" height="32"> + <object id="2" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="768" y="736" width="32" height="32"/> + <object id="3" name="To Outside" type="warp" x="2336" y="960" width="32" height="32"> <properties> <property name="dest_map" value="031-1"/> - <property name="dest_tile_x" value="90"/> - <property name="dest_tile_y" value="116"/> + <property name="dest_x" value="90"/> + <property name="dest_y" value="116"/> </properties> </object> </objectgroup> diff --git a/maps/031-3.tmx b/maps/031-3.tmx index 40313740..121dee01 100644 --- a/maps/031-3.tmx +++ b/maps/031-3.tmx @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="320" height="320" tilewidth="32" tileheight="32" nextobjectid="139"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="320" height="320" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="139"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Ice Labyrinth"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/icecave.tsx"/> - <layer name="Ground1" width="320" height="320"> + <layer id="1" name="Ground1" width="320" height="320"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -330,7 +330,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="320" height="320"> + <layer id="2" name="Fringe" width="320" height="320"> <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, @@ -654,7 +654,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 </data> </layer> - <layer name="Over1" width="320" height="320"> + <layer id="3" name="Over1" width="320" height="320"> <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, @@ -978,7 +978,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 </data> </layer> - <layer name="Collision" width="320" height="320"> + <layer id="4" name="Collision" width="320" height="320"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1302,764 +1302,764 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="5" name="Objects" visible="0"> <object id="1" name="To Nivalis Port" type="warp" x="6784" y="9600" width="32" height="32"> <properties> <property name="dest_map" value="031-1"/> - <property name="dest_tile_x" value="76"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="76"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="2" name="To Ice Labyrinth" type="warp" x="6560" y="8448" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="150"/> - <property name="dest_tile_y" value="260"/> + <property name="dest_x" value="150"/> + <property name="dest_y" value="260"/> </properties> </object> <object id="3" name="To Ice Labyrinth" type="warp" x="4768" y="8288" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="206"/> - <property name="dest_tile_y" value="265"/> + <property name="dest_x" value="206"/> + <property name="dest_y" value="265"/> </properties> </object> <object id="4" name="To Ice Labyrinth" type="warp" x="7200" y="9024" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="274"/> - <property name="dest_tile_y" value="299"/> + <property name="dest_x" value="274"/> + <property name="dest_y" value="299"/> </properties> </object> <object id="5" name="To Ice Labyrinth" type="warp" x="8768" y="9600" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="225"/> - <property name="dest_tile_y" value="283"/> + <property name="dest_x" value="225"/> + <property name="dest_y" value="283"/> </properties> </object> <object id="6" name="To Ice Labyrinth" type="warp" x="9056" y="8672" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="269"/> - <property name="dest_tile_y" value="244"/> + <property name="dest_x" value="269"/> + <property name="dest_y" value="244"/> </properties> </object> <object id="7" name="To Ice Labyrinth" type="warp" x="8608" y="7840" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="283"/> - <property name="dest_tile_y" value="272"/> + <property name="dest_x" value="283"/> + <property name="dest_y" value="272"/> </properties> </object> <object id="8" name="To Ice Labyrinth" type="warp" x="4736" y="4800" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="128"/> - <property name="dest_tile_y" value="134"/> + <property name="dest_x" value="128"/> + <property name="dest_y" value="134"/> </properties> </object> <object id="9" name="To Ice Labyrinth" type="warp" x="4448" y="8256" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="156"/> - <property name="dest_tile_y" value="196"/> + <property name="dest_x" value="156"/> + <property name="dest_y" value="196"/> </properties> </object> <object id="10" name="To Ice Labyrinth" type="warp" x="4960" y="6240" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="139"/> - <property name="dest_tile_y" value="259"/> + <property name="dest_x" value="139"/> + <property name="dest_y" value="259"/> </properties> </object> <object id="11" name="To Ice Labyrinth" type="warp" x="4544" y="9632" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="98"/> - <property name="dest_tile_y" value="300"/> + <property name="dest_x" value="98"/> + <property name="dest_y" value="300"/> </properties> </object> <object id="12" name="To Ice Labyrinth" type="warp" x="3104" y="9632" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="143"/> - <property name="dest_tile_y" value="300"/> + <property name="dest_x" value="143"/> + <property name="dest_y" value="300"/> </properties> </object> <object id="13" name="To Ice Labyrinth" type="warp" x="4320" y="6272" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="106"/> - <property name="dest_tile_y" value="231"/> + <property name="dest_x" value="106"/> + <property name="dest_y" value="231"/> </properties> </object> <object id="14" name="To Ice Labyrinth" type="warp" x="3392" y="7424" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="135"/> - <property name="dest_tile_y" value="197"/> + <property name="dest_x" value="135"/> + <property name="dest_y" value="197"/> </properties> </object> <object id="15" name="To Ice Labyrinth" type="warp" x="9152" y="6080" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="227"/> - <property name="dest_tile_y" value="241"/> + <property name="dest_x" value="227"/> + <property name="dest_y" value="241"/> </properties> </object> <object id="16" name="To Ice Labyrinth" type="warp" x="7264" y="7744" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="286"/> - <property name="dest_tile_y" value="191"/> + <property name="dest_x" value="286"/> + <property name="dest_y" value="191"/> </properties> </object> <object id="17" name="To Ice Labyrinth" type="warp" x="7552" y="6752" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="187"/> - <property name="dest_tile_y" value="227"/> + <property name="dest_x" value="187"/> + <property name="dest_y" value="227"/> </properties> </object> <object id="18" name="To Ice Labyrinth" type="warp" x="5984" y="7296" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="236"/> - <property name="dest_tile_y" value="212"/> + <property name="dest_x" value="236"/> + <property name="dest_y" value="212"/> </properties> </object> <object id="19" name="To Ice Labyrinth" type="warp" x="3008" y="8128" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="54"/> - <property name="dest_tile_y" value="251"/> + <property name="dest_x" value="54"/> + <property name="dest_y" value="251"/> </properties> </object> <object id="20" name="To Ice Labyrinth" type="warp" x="1728" y="8000" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="94"/> - <property name="dest_tile_y" value="255"/> + <property name="dest_x" value="94"/> + <property name="dest_y" value="255"/> </properties> </object> <object id="21" name="To Ice Labyrinth" type="warp" x="3296" y="6368" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="52"/> - <property name="dest_tile_y" value="176"/> + <property name="dest_x" value="52"/> + <property name="dest_y" value="176"/> </properties> </object> <object id="22" name="To Ice Labyrinth" type="warp" x="1664" y="5664" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="103"/> - <property name="dest_tile_y" value="200"/> + <property name="dest_x" value="103"/> + <property name="dest_y" value="200"/> </properties> </object> <object id="23" name="To Ice Labyrinth" type="warp" x="6784" y="6176" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="207"/> - <property name="dest_tile_y" value="167"/> + <property name="dest_x" value="207"/> + <property name="dest_y" value="167"/> </properties> </object> <object id="24" name="To Ice Labyrinth" type="warp" x="6624" y="5376" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="212"/> - <property name="dest_tile_y" value="194"/> + <property name="dest_x" value="212"/> + <property name="dest_y" value="194"/> </properties> </object> <object id="25" name="To Ice Labyrinth" type="warp" x="7520" y="5344" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="195"/> - <property name="dest_tile_y" value="123"/> + <property name="dest_x" value="195"/> + <property name="dest_y" value="123"/> </properties> </object> <object id="26" name="To Ice Labyrinth" type="warp" x="6240" y="3904" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="235"/> - <property name="dest_tile_y" value="166"/> + <property name="dest_x" value="235"/> + <property name="dest_y" value="166"/> </properties> </object> <object id="27" name="To Ice Labyrinth" type="warp" x="9472" y="3104" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="292"/> - <property name="dest_tile_y" value="124"/> + <property name="dest_x" value="292"/> + <property name="dest_y" value="124"/> </properties> </object> <object id="28" name="To Ice Labyrinth" type="warp" x="9344" y="3936" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="296"/> - <property name="dest_tile_y" value="96"/> + <property name="dest_x" value="296"/> + <property name="dest_y" value="96"/> </properties> </object> <object id="29" name="To Ice Labyrinth" type="warp" x="9248" y="5248" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="228"/> - <property name="dest_tile_y" value="122"/> + <property name="dest_x" value="228"/> + <property name="dest_y" value="122"/> </properties> </object> <object id="30" name="To Ice Labyrinth" type="warp" x="7296" y="3872" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="289"/> - <property name="dest_tile_y" value="163"/> + <property name="dest_x" value="289"/> + <property name="dest_y" value="163"/> </properties> </object> <object id="31" name="To Ice Labyrinth" type="warp" x="768" y="5024" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="143"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="143"/> </properties> </object> <object id="32" name="To Ice Labyrinth" type="warp" x="992" y="4608" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="158"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="158"/> </properties> </object> <object id="33" name="To Ice Labyrinth" type="warp" x="1152" y="7968" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="225"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="225"/> </properties> </object> <object id="34" name="To Ice Labyrinth" type="warp" x="1120" y="7232" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="250"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="250"/> </properties> </object> <object id="35" name="To Ice Labyrinth" type="warp" x="1088" y="800" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="281"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="281"/> + <property name="dest_y" value="24"/> </properties> </object> <object id="36" name="To Ice Labyrinth" type="warp" x="8992" y="704" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="34"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="34"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="37" name="To Ice Labyrinth" type="warp" x="9056" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="275"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="275"/> + <property name="dest_y" value="74"/> </properties> </object> <object id="38" name="To Ice Labyrinth" type="warp" x="8800" y="2336" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="283"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="283"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="39" name="To Ice Labyrinth" type="warp" x="832" y="5696" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="201"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="201"/> </properties> </object> <object id="40" name="To Ice Labyrinth" type="warp" x="1152" y="6400" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="26"/> - <property name="dest_tile_y" value="177"/> + <property name="dest_x" value="26"/> + <property name="dest_y" value="177"/> </properties> </object> <object id="41" name="To Ice Labyrinth" type="warp" x="2912" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="36"/> - <property name="dest_tile_y" value="79"/> + <property name="dest_x" value="36"/> + <property name="dest_y" value="79"/> </properties> </object> <object id="42" name="To Ice Labyrinth" type="warp" x="1152" y="2560" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="126"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="126"/> </properties> </object> <object id="43" name="To Ice Labyrinth" type="warp" x="1664" y="2496" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="192"/> - <property name="dest_tile_y" value="71"/> + <property name="dest_x" value="192"/> + <property name="dest_y" value="71"/> </properties> </object> <object id="44" name="To Ice Labyrinth" type="warp" x="6144" y="2240" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="52"/> - <property name="dest_tile_y" value="77"/> + <property name="dest_x" value="52"/> + <property name="dest_y" value="77"/> </properties> </object> <object id="45" name="To Ice Labyrinth" type="warp" x="4096" y="4320" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="148"/> - <property name="dest_tile_y" value="151"/> + <property name="dest_x" value="148"/> + <property name="dest_y" value="151"/> </properties> </object> <object id="46" name="To Ice Labyrinth" type="warp" x="7424" y="2976" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="234"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="234"/> + <property name="dest_y" value="26"/> </properties> </object> <object id="47" name="To Ice Labyrinth" type="warp" x="7488" y="800" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="232"/> - <property name="dest_tile_y" value="92"/> + <property name="dest_x" value="232"/> + <property name="dest_y" value="92"/> </properties> </object> <object id="48" name="IceGoblin" type="spawn" x="6976" y="8512" width="832" height="864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="56"/> </properties> </object> <object id="49" name="IceGoblin" type="spawn" x="5856" y="8448" width="832" height="864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="56"/> </properties> </object> <object id="50" name="Bat" type="spawn" x="5760" y="8352" width="2144" height="1408"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="51" name="Yeti" type="spawn" x="768" y="6464" width="896" height="768"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="52" name="Bat" type="spawn" x="704" y="6432" width="896" height="768"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="15"/> </properties> </object> <object id="53" name="Moggun" type="spawn" x="512" y="3616" width="1440" height="2208"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="19"/> <property name="monster_id" value="59"/> </properties> </object> <object id="54" name="Moggun" type="spawn" x="2432" y="8000" width="1376" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="55" name="Moggun" type="spawn" x="2432" y="8960" width="1376" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="56" name="Bat" type="spawn" x="128" y="4064" width="2080" height="1408"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="15"/> </properties> </object> <object id="57" name="Bat" type="spawn" x="2752" y="8192" width="736" height="1376"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="15"/> </properties> </object> <object id="58" name="Bat" type="spawn" x="4384" y="8352" width="736" height="1376"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="15"/> </properties> </object> <object id="59" name="IceGoblin" type="spawn" x="4256" y="8960" width="832" height="864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="56"/> </properties> </object> <object id="60" name="IceElement" type="spawn" x="2528" y="6144" width="1280" height="1440"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="69"/> </properties> </object> <object id="61" name="IceGoblin" type="spawn" x="2784" y="6432" width="832" height="864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="56"/> </properties> </object> <object id="62" name="IceGoblin" type="spawn" x="5888" y="3776" width="960" height="1728"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="56"/> </properties> </object> <object id="63" name="Moggun" type="spawn" x="2432" y="8960" width="1376" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="64" name="IceGoblin" type="spawn" x="8384" y="8800" width="1088" height="480"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="56"/> </properties> </object> <object id="65" name="IceElement" type="spawn" x="2528" y="6144" width="1280" height="1440"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="69"/> </properties> </object> <object id="66" name="IceElement" type="spawn" x="8992" y="5792" width="288" height="2432"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="69"/> </properties> </object> <object id="67" name="Bat" type="spawn" x="8416" y="5920" width="1344" height="2080"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="15"/> </properties> </object> <object id="68" name="Moggun" type="spawn" x="8032" y="7264" width="2048" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="59"/> </properties> </object> <object id="69" name="Moggun" type="spawn" x="8032" y="6016" width="2016" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="59"/> </properties> </object> <object id="70" name="Yeti" type="spawn" x="6912" y="6688" width="896" height="1120"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="70"/> </properties> </object> <object id="71" name="IceGoblin" type="spawn" x="7168" y="6592" width="416" height="1376"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="56"/> </properties> </object> <object id="72" name="Yeti" type="spawn" x="6496" y="6112" width="416" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="73" name="Yeti" type="spawn" x="5984" y="6656" width="416" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="70"/> </properties> </object> <object id="74" name="Bat" type="spawn" x="5760" y="8352" width="2144" height="1408"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="75" name="Pollett" type="spawn" x="5760" y="8352" width="2144" height="1408"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="111"/> </properties> </object> <object id="76" name="Bat" type="spawn" x="5664" y="6176" width="1472" height="480"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="13"/> <property name="monster_id" value="15"/> </properties> </object> <object id="77" name="Yeti" type="spawn" x="6496" y="6112" width="416" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="78" name="Yeti" type="spawn" x="7200" y="4224" width="608" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="79" name="Moggun" type="spawn" x="8032" y="6016" width="2016" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="59"/> </properties> </object> <object id="80" name="Moggun" type="spawn" x="5792" y="4832" width="2016" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="59"/> </properties> </object> <object id="81" name="Moggun" type="spawn" x="5792" y="4832" width="2016" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="59"/> </properties> </object> <object id="82" name="Moggun" type="spawn" x="5792" y="3904" width="2016" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="59"/> </properties> </object> <object id="83" name="Moggun" type="spawn" x="8448" y="3808" width="1312" height="1568"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="59"/> </properties> </object> <object id="84" name="Bat" type="spawn" x="8480" y="2208" width="1184" height="1024"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="15"/> </properties> </object> <object id="85" name="Bat" type="spawn" x="8480" y="2208" width="1184" height="1024"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="15"/> </properties> </object> <object id="86" name="Yeti" type="spawn" x="8544" y="2080" width="512" height="1056"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="87" name="Moggun" type="spawn" x="576" y="608" width="1440" height="2208"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="59"/> </properties> </object> <object id="88" name="Yeti" type="spawn" x="2496" y="4640" width="2752" height="992"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="70"/> </properties> </object> <object id="89" name="Yeti" type="spawn" x="2560" y="3808" width="2656" height="800"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="70"/> </properties> </object> <object id="90" name="IceGoblin" type="spawn" x="3040" y="3744" width="832" height="864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="56"/> </properties> </object> <object id="91" name="IceGoblin" type="spawn" x="4256" y="4736" width="832" height="800"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="56"/> </properties> </object> <object id="92" name="IceGoblin" type="spawn" x="2624" y="4960" width="832" height="800"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="56"/> </properties> </object> <object id="93" name="IceElement" type="spawn" x="8544" y="736" width="1024" height="928"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="69"/> </properties> </object> <object id="94" name="IceElement" type="spawn" x="5792" y="640" width="2080" height="1056"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="69"/> </properties> </object> <object id="95" name="IceElement" type="spawn" x="6816" y="2208" width="1024" height="928"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="69"/> </properties> </object> <object id="96" name="IceElement" type="spawn" x="8832" y="4224" width="512" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="69"/> </properties> </object> <object id="97" name="IceElement" type="spawn" x="5856" y="2208" width="1024" height="928"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="69"/> </properties> </object> <object id="98" name="IceGoblin" type="spawn" x="6464" y="1984" width="832" height="864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="56"/> </properties> </object> <object id="99" name="Bat" type="spawn" x="5888" y="512" width="2144" height="1408"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="15"/> </properties> </object> <object id="100" name="Bat" type="spawn" x="224" y="768" width="2080" height="1824"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="15"/> </properties> </object> <object id="101" name="Bat" type="spawn" x="224" y="7872" width="2080" height="1824"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="15"/> </properties> @@ -2067,293 +2067,293 @@ <object id="102" name="To Ice Labyrinth" type="warp" x="6400" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="136"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="136"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="103" name="To Ice Labyrinth" type="warp" x="4352" y="928" width="32" height="32"> <properties> <property name="dest_map" value="031-3"/> - <property name="dest_tile_x" value="200"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="200"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="104" name="Bat" type="spawn" x="3200" y="608" width="1280" height="2080"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="15"/> </properties> </object> <object id="105" name="IceElement" type="spawn" x="2912" y="800" width="1856" height="1664"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="69"/> </properties> </object> <object id="106" name="Yeti" type="spawn" x="3520" y="2272" width="672" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="107" name="WhiteSlime" type="spawn" x="1088" y="9024" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="108" name="BlueSlime" type="spawn" x="672" y="8032" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="109" name="WhiteSlime" type="spawn" x="6560" y="8736" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="110" name="WhiteSlime" type="spawn" x="9152" y="9376" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="111" name="BlueSlime" type="spawn" x="9120" y="9088" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="112" name="WhiteSlime" type="spawn" x="9376" y="7360" width="256" height="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="113" name="WhiteSlime" type="spawn" x="8576" y="7008" width="256" height="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="114" name="BlueSlime" type="spawn" x="8128" y="6560" width="1792" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="89"/> </properties> </object> <object id="115" name="WhiteSlime" type="spawn" x="3936" y="1056" width="224" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="116" name="BlueSlime" type="spawn" x="4032" y="3616" width="1120" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="117" name="WhiteSlime" type="spawn" x="1312" y="1952" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="118" name="BlueSlime" type="spawn" x="1120" y="3424" width="192" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="89"/> </properties> </object> <object id="119" name="WhiteSlime" type="spawn" x="4128" y="7136" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="120" name="BlueSlime" type="spawn" x="4672" y="6720" width="448" height="576"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="89"/> </properties> </object> <object id="121" name="WhiteSlime" type="spawn" x="4192" y="6496" width="320" height="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="122" name="WhiteSlime" type="spawn" x="4832" y="6368" width="256" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="123" name="BlueSlime" type="spawn" x="4256" y="6848" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="124" name="WhiteSlime" type="spawn" x="3488" y="8768" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="125" name="WhiteSlime" type="spawn" x="4480" y="9344" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="126" name="WhiteSlime" type="spawn" x="4672" y="8512" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="127" name="WhiteSlime" type="spawn" x="4256" y="8384" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="128" name="WhiteSlime" type="spawn" x="4928" y="8992" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="129" name="BlueSlime" type="spawn" x="4064" y="8160" width="832" height="640"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="89"/> </properties> </object> <object id="130" name="WhiteSlime" type="spawn" x="672" y="8416" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="131" name="WhiteSlime" type="spawn" x="1568" y="8896" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="132" name="WhiteSlime" type="spawn" x="1088" y="8064" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="133" name="WhiteSlime" type="spawn" x="672" y="9216" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="134" name="WhiteSlime" type="spawn" x="1440" y="9472" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="135" name="WhiteSlime" type="spawn" x="1600" y="8256" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="136" name="BlueSlime" type="spawn" x="512" y="8672" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="137" name="BlueSlime" type="spawn" x="960" y="8576" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="138" name="BlueSlime" type="spawn" x="1440" y="8992" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> diff --git a/maps/031-4.tmx b/maps/031-4.tmx index 72a07c1d..9309c967 100644 --- a/maps/031-4.tmx +++ b/maps/031-4.tmx @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="96" height="92" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="96" height="92" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="1"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Cindy Cave"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/icecave.tsx"/> - <layer name="Ground1" width="96" height="92"> + <layer id="1" name="Ground1" width="96" height="92"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -102,7 +102,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="96" height="92"> + <layer id="2" name="Fringe" width="96" height="92"> <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, @@ -198,7 +198,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 </data> </layer> - <layer name="Over1" width="96" height="92"> + <layer id="3" name="Over1" width="96" height="92"> <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, @@ -294,7 +294,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 </data> </layer> - <layer name="Collision" width="96" height="92"> + <layer id="4" name="Collision" width="96" height="92"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, diff --git a/maps/032-3.tmx b/maps/032-3.tmx index 254ed33f..8f5295b8 100644 --- a/maps/032-3.tmx +++ b/maps/032-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="160" height="100" tilewidth="32" tileheight="32" nextobjectid="13"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="160" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="13"> <properties> <property name="music" value="cavesong.ogg"/> <property name="name" value="Outback Cave"/> @@ -10,7 +10,7 @@ <tileset firstgid="3" source="../tilesets/cave2.tsx"/> <tileset firstgid="131" source="../tilesets/cave2_x2.tsx"/> <tileset firstgid="163" source="../tilesets/cave2_bilevel.tsx"/> - <layer name="Ground1" width="160" height="100"> + <layer id="1" name="Ground1" width="160" height="100"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -114,7 +114,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="160" height="100"> + <layer id="2" name="Fringe" width="160" height="100"> <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, @@ -218,7 +218,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 </data> </layer> - <layer name="Over1" width="160" height="100"> + <layer id="3" name="Over1" width="160" height="100"> <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, @@ -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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="160" height="100"> + <layer id="4" name="Collision" width="160" height="100"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -426,97 +426,97 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="5" name="Objects"> <object id="1" name="To Desert Mountains" type="warp" x="4096" y="1088" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="30"/> - <property name="dest_tile_y" value="124"/> + <property name="dest_x" value="30"/> + <property name="dest_y" value="124"/> </properties> </object> <object id="2" name="To Desert Mountains" type="Warp" x="1792" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="006-1"/> - <property name="dest_tile_x" value="111"/> - <property name="dest_tile_y" value="111"/> + <property name="dest_x" value="111"/> + <property name="dest_y" value="111"/> </properties> </object> <object id="3" name="Skeleton" type="spawn" x="2752" y="1248" width="320" height="352"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="41"/> </properties> </object> <object id="4" name="MountainSnake" type="spawn" x="960" y="384" width="960" height="736"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="24"/> </properties> </object> <object id="5" name="Snake" type="spawn" x="3456" y="288" width="1152" height="2432"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="13"/> <property name="monster_id" value="8"/> </properties> </object> <object id="6" name="BlackScorpion" type="spawn" x="2432" y="1248" width="320" height="352"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="7"/> </properties> </object> <object id="7" name="Spider" type="spawn" x="2592" y="896" width="320" height="352"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="10"/> </properties> </object> <object id="8" name="Archant" type="spawn" x="2080" y="448" width="1216" height="320"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="58"/> </properties> </object> <object id="9" name="Archant" type="spawn" x="2112" y="2112" width="800" height="704"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="58"/> </properties> </object> <object id="10" name="YellowSlime" type="spawn" x="416" y="2112" width="800" height="704"> <properties> - <property name="eA_death" value="1000000"/> - <property name="eA_spawn" value="300000"/> + <property name="death" value="1000000"/> + <property name="spawn" value="300000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="5"/> </properties> </object> <object id="11" name="CaveMaggot" type="spawn" x="928" y="1344" width="1120" height="608"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="11"/> <property name="monster_id" value="54"/> </properties> </object> <object id="12" name="Bat" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="100000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="25"/> <property name="monster_id" value="15"/> </properties> diff --git a/maps/033-1.tmx b/maps/033-1.tmx index 2dae5f70..2b5adce7 100644 --- a/maps/033-1.tmx +++ b/maps/033-1.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" nextobjectid="8"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="138" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="8"> <properties> - <property name="music" value="explorers-melody.ogg"/> + <property name="music" value="Barbarians.ogg"/> <property name="name" value="snow Path"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> @@ -12,7 +12,7 @@ <tileset firstgid="535" source="../tilesets/snow_ground.tsx"/> <tileset firstgid="612" source="../tilesets/barbarians_outdoor.tsx"/> <tileset firstgid="615" source="../tilesets/barbarians_yurt_x4.tsx"/> - <layer name="Ground1" width="138" height="128"> + <layer id="1" name="Ground1" width="138" height="128"> <data encoding="csv"> 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, @@ -144,7 +144,7 @@ 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,8,8,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86 </data> </layer> - <layer name="Ground2" width="138" height="128"> + <layer id="2" name="Ground2" width="138" height="128"> <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,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,180,179,180,180,180,180,179,180,180,180,180,163,164,164,135,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,131,132,132,132,132,132,133,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,179,180,180,180,180,179,180,180,180,180,179,180,180,163,164,164,164,164,164, @@ -276,7 +276,7 @@ 0,0,0,0,0,147,0,0,0,0,0,0,0,147,0,0,0,0,149,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,26,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,0,0,0 </data> </layer> - <layer name="Fringe" width="138" height="128"> + <layer id="3" name="Fringe" width="138" height="128"> <data encoding="csv"> 0,0,0,0,0,277,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 277,0,0,275,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,276,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -408,7 +408,7 @@ 0,0,276,0,0,0,0,0,0,0,0,275,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0 </data> </layer> - <layer name="Over1" width="138" height="128"> + <layer id="4" name="Over1" width="138" height="128"> <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, @@ -540,7 +540,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 </data> </layer> - <layer name="Over2" width="138" height="128"> + <layer id="5" name="Over2" width="138" height="128"> <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, @@ -672,7 +672,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 </data> </layer> - <layer name="Collision" width="138" height="128"> + <layer id="6" name="Collision" width="138" height="128"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -804,43 +804,43 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Snow Forest" type="warp" x="704" y="608" width="32" height="64"> <properties> <property name="dest_map" value="034-1"/> - <property name="dest_tile_x" value="159"/> - <property name="dest_tile_y" value="19"/> + <property name="dest_x" value="159"/> + <property name="dest_y" value="19"/> </properties> </object> <object id="2" name="graphics/particles/bonfire-shifted.particle.xml" type="particle_effect" x="2240" y="960"/> <object id="3" name="Wolvern" type="spawn" x="2176" y="1280" width="352" height="608"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="88"/> </properties> </object> <object id="4" name="Reinboo" type="spawn" x="832" y="448" width="512" height="1600"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="92"/> </properties> </object> <object id="5" name="Squirrel" type="spawn" x="992" y="2112" width="1632" height="1376"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="36"/> </properties> </object> <object id="6" name="WhiteBell" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="93"/> </properties> @@ -848,8 +848,8 @@ <object id="7" name="To Snow Field" type="warp" x="3808" y="2208" width="32" height="64"> <properties> <property name="dest_map" value="019-1"/> - <property name="dest_tile_x" value="22"/> - <property name="dest_tile_y" value="69"/> + <property name="dest_x" value="22"/> + <property name="dest_y" value="69"/> </properties> </object> </objectgroup> diff --git a/maps/034-1.tmx b/maps/034-1.tmx index 43ae4784..f0a21035 100644 --- a/maps/034-1.tmx +++ b/maps/034-1.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="178" height="128" tilewidth="32" tileheight="32" nextobjectid="13"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="178" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="13"> <properties> - <property name="music" value="explorers-melody.ogg"/> + <property name="music" value="Barbarians.ogg"/> <property name="name" value="Snow Forest"/> <property name="overlay0image" value="graphics/images/ambient/snow.png"/> <property name="overlay0parallax" value="2.4"/> @@ -22,7 +22,7 @@ <tileset firstgid="275" source="../tilesets/snow_tree_x3.tsx"/> <tileset firstgid="279" source="../tilesets/snow_village.tsx"/> <tileset firstgid="535" source="../tilesets/snow_village_x4.tsx"/> - <layer name="Ground1" width="178" height="128"> + <layer id="1" name="Ground1" width="178" height="128"> <data encoding="csv"> 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, @@ -154,7 +154,7 @@ 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86 </data> </layer> - <layer name="Ground2" width="178" height="128"> + <layer id="2" name="Ground2" width="178" height="128"> <data encoding="csv"> 0,163,135,0,0,0,0,0,163,164,164,164,164,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,165,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,164,164,164,135,0,0,0,0,134,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,165,181,196,197,148,148,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0, 0,179,147,0,0,0,0,0,179,180,183,180,180,180,180,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,165,180,181,0,0,0,0,0,163,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,164,164,165,180,180,168,180,163,164,164,164,164,165,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,180,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,0,0,0,0,0,0,0,0, @@ -286,7 +286,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,147,0,0,0,0,0,0,0,147,0,0,0,0,149,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,0 </data> </layer> - <layer name="Fringe" width="178" height="128"> + <layer id="3" name="Fringe" width="178" height="128"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,267,0,0,0,0,0,0,275,0,0,0,0,0,277,0,0,0,0,0,0,0,277,0,0,0,261,262,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,276,0,0,0,0,0,275,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,276,0,0,277,0,0,275,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,276,0,0,276,0, @@ -418,7 +418,7 @@ 0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,277,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,276,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,276,0,276,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,276,0,0,0,0,276,0,0,0,0,0,0,0,0,275,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Over1" width="178" height="128"> + <layer id="4" name="Over1" width="178" height="128"> <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, @@ -550,7 +550,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 </data> </layer> - <layer name="Over2" width="178" height="128"> + <layer id="5" name="Over2" width="178" height="128"> <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, @@ -682,7 +682,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 </data> </layer> - <layer name="Collision" width="178" height="128"> + <layer id="6" name="Collision" width="178" height="128"> <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,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -814,56 +814,56 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Snow Field" type="warp" x="5120" y="608" width="32" height="64"> <properties> <property name="dest_map" value="033-1"/> - <property name="dest_tile_x" value="23"/> - <property name="dest_tile_y" value="19"/> + <property name="dest_x" value="23"/> + <property name="dest_y" value="19"/> </properties> </object> <object id="2" name="To Deep Snow Forest" type="warp" x="512" y="3264" width="32" height="96"> <properties> <property name="dest_map" value="045-1"/> - <property name="dest_tile_x" value="176"/> - <property name="dest_tile_y" value="133"/> + <property name="dest_x" value="176"/> + <property name="dest_y" value="133"/> </properties> </object> <object id="3" name="To Deep Snow Forest" type="warp" x="480" y="960" width="32" height="64"> <properties> <property name="dest_map" value="045-1"/> - <property name="dest_tile_x" value="174"/> - <property name="dest_tile_y" value="59"/> + <property name="dest_x" value="174"/> + <property name="dest_y" value="59"/> </properties> </object> <object id="4" name="Reinboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="92"/> </properties> </object> <object id="5" name="Fluffy" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="25"/> <property name="monster_id" value="18"/> </properties> </object> <object id="6" name="WhiteBell" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="93"/> </properties> </object> <object id="7" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="25"/> <property name="monster_id" value="36"/> </properties> @@ -871,36 +871,36 @@ <object id="8" name="To Highlands" type="warp" x="3008" y="576" width="64" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="94"/> - <property name="dest_tile_y" value="123"/> + <property name="dest_x" value="94"/> + <property name="dest_y" value="123"/> </properties> </object> <object id="9" name="To Trapper" type="warp" x="992" y="2176" width="32" height="32"> <properties> <property name="dest_map" value="034-2"/> - <property name="dest_tile_x" value="28"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="28"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="10" name="To Cabin" type="warp" x="2048" y="3168" width="32" height="32"> <properties> <property name="dest_map" value="034-2"/> - <property name="dest_tile_x" value="73"/> - <property name="dest_tile_y" value="29"/> + <property name="dest_x" value="73"/> + <property name="dest_y" value="29"/> </properties> </object> <object id="11" name="Santaboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="1112"/> </properties> </object> <object id="12" name="IceGoblin" type="spawn" x="32" y="32"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="25"/> <property name="monster_id" value="56"/> </properties> diff --git a/maps/034-2.tmx b/maps/034-2.tmx index 53302720..4e81d248 100644 --- a/maps/034-2.tmx +++ b/maps/034-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="53" tilewidth="32" tileheight="32" nextobjectid="5"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="53" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="5"> <properties> <property name="Authors" value="The Mana World, bh28."/> <property name="music" value="snow-village.ogg"/> @@ -10,7 +10,7 @@ <tileset firstgid="259" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="515" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="563" source="../tilesets/woodland_indoor_x3.tsx"/> - <layer name="Ground1" width="100" height="53"> + <layer id="1" name="Ground1" width="100" height="53"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -67,7 +67,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="100" height="53"> + <layer id="2" name="Ground2" width="100" height="53"> <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, @@ -124,7 +124,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 </data> </layer> - <layer name="Ground3" width="100" height="53"> + <layer id="3" name="Ground3" width="100" height="53"> <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, @@ -181,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,0,0,0,0,0,0,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="100" height="53"> + <layer id="4" name="Fringe" width="100" height="53"> <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, @@ -238,7 +238,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 </data> </layer> - <layer name="Over1" width="100" height="53"> + <layer id="5" name="Over1" width="100" height="53"> <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, @@ -295,7 +295,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 </data> </layer> - <layer name="Collision" width="100" height="53"> + <layer id="6" name="Collision" width="100" height="53"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -352,20 +352,20 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="7" name="Objects" visible="0"> <object id="1" name="To Outside" type="warp" x="896" y="1024" width="32" height="32"> <properties> <property name="dest_map" value="034-1"/> - <property name="dest_tile_x" value="31"/> - <property name="dest_tile_y" value="69"/> + <property name="dest_x" value="31"/> + <property name="dest_y" value="69"/> </properties> </object> <object id="2" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="992" y="736" width="32" height="32"/> <object id="3" name="To Outside" type="warp" x="2336" y="960" width="32" height="32"> <properties> <property name="dest_map" value="034-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="100"/> </properties> </object> <object id="4" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="2272" y="704" width="32" height="32"/> diff --git a/maps/035-2.tmx b/maps/035-2.tmx index 0f89b8a9..ceb46a21 100644 --- a/maps/035-2.tmx +++ b/maps/035-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="60" height="60" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1"> <properties> <property name="Name" value="Koga - Main"/> <property name="music" value="sail-away.ogg"/> @@ -7,9 +7,9 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/> - <tileset firstgid="291" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="307" source="../tilesets/inn_x3.tsx"/> - <layer name="Ground1" width="60" height="60"> + <tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/> + <tileset firstgid="355" source="../tilesets/inn_x3.tsx"/> + <layer id="1" name="Ground1" width="60" height="60"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -73,7 +73,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="60" height="60"> + <layer id="2" name="Ground2" width="60" height="60"> <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, @@ -137,7 +137,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 name="Ground3" width="60" height="60"> + <layer id="3" name="Ground3" width="60" height="60"> <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, @@ -201,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 </data> </layer> - <layer name="Fringe" width="60" height="60"> + <layer id="4" name="Fringe" width="60" height="60"> <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, @@ -230,18 +230,18 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,299,299,299,299,292,299,299,299,299,299,299,299,299,299,292,299,299,299,299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,315,315,315,315,308,315,315,315,315,315,315,315,315,315,308,315,315,315,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,299,299,299,299,299,292,299,299,299,299,299,299,299,292,299,299,299,299,299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,302,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,315,315,315,315,315,308,315,315,315,315,315,315,315,308,315,315,315,315,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,318,319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,0,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,302,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,318,319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -265,7 +265,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 name="Over1" width="60" height="60"> + <layer id="5" name="Over1" width="60" height="60"> <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, @@ -329,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 </data> </layer> - <layer name="Collision" width="60" height="60"> + <layer id="6" name="Collision" width="60" height="60"> <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, @@ -393,5 +393,5 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"/> + <objectgroup id="7" name="Objects" visible="0"/> </map> diff --git a/maps/036-2.tmx b/maps/036-2.tmx index 5a964f9c..dd88f361 100644 --- a/maps/036-2.tmx +++ b/maps/036-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="60" height="60" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1"> <properties> <property name="Name" value="Koga - Candor"/> <property name="music" value="sail-away.ogg"/> @@ -7,9 +7,9 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/> - <tileset firstgid="291" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="307" source="../tilesets/inn_x3.tsx"/> - <layer name="Ground1" width="60" height="60"> + <tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/> + <tileset firstgid="355" source="../tilesets/inn_x3.tsx"/> + <layer id="1" name="Ground1" width="60" height="60"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -73,7 +73,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="60" height="60"> + <layer id="2" name="Ground2" width="60" height="60"> <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, @@ -137,7 +137,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 name="Ground3" width="60" height="60"> + <layer id="3" name="Ground3" width="60" height="60"> <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, @@ -201,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 </data> </layer> - <layer name="Fringe" width="60" height="60"> + <layer id="4" name="Fringe" width="60" height="60"> <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, @@ -230,18 +230,18 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,299,299,299,299,292,299,299,299,299,299,299,299,299,299,292,299,299,299,299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,315,315,315,315,308,315,315,315,315,315,315,315,315,315,308,315,315,315,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,299,299,299,299,299,292,299,299,299,299,299,299,299,292,299,299,299,299,299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,302,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,315,315,315,315,315,308,315,315,315,315,315,315,315,308,315,315,315,315,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,318,319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,0,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,302,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,318,319,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -265,7 +265,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 name="Over1" width="60" height="60"> + <layer id="5" name="Over1" width="60" height="60"> <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, @@ -329,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 </data> </layer> - <layer name="Collision" width="60" height="60"> + <layer id="6" name="Collision" width="60" height="60"> <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, @@ -393,5 +393,5 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"/> + <objectgroup id="7" name="Objects" visible="0"/> </map> diff --git a/maps/041-1.tmx b/maps/041-1.tmx index c1a67a50..d3a2e4c4 100644 --- a/maps/041-1.tmx +++ b/maps/041-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="150" height="125" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="14"> <properties> <property name="music" value="faith.ogg"/> <property name="name" value="Beach"/> @@ -17,7 +17,7 @@ <tileset firstgid="1137" source="../tilesets/water.tsx"/> <tileset firstgid="1302" source="../tilesets/waterflow.tsx"/> <tileset firstgid="1374" source="../tilesets/signs_x2.tsx"/> - <layer name="Ground1" width="150" height="125"> + <layer id="1" name="Ground1" width="150" height="125"> <data encoding="csv"> 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,358,359,360,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,955,955,3,3,955,955,955,955,955,3,3,3,3,3,3,3,120,121,135,38,135,135,135,136,137,151,151,151,54,151,151,151,54,151,151,151,151,54,151,151,151,151,152,137,151,151,151,151,150,151,151,151,151,54,151,152,137,151,151,152,425,167,167,167,167,167,167,150,151,151,151,151,151,152,154, 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,358,359,360,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,120,121,135,38,135,135,135,136,137,151,54,151,151,151,152,137,151,151,151,54,151,151,151,151,151,54,151,151,151,151,54,151,151,152,153,167,167,167,70,150,151,54,151,151,151,151,152,153,167,167,168,441,3,3,3,3,3,3,166,167,167,167,167,167,168,170, @@ -146,7 +146,7 @@ 1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1300,1282,3,3,3,165,166,167,70,167,167,150,151,151,54,151,151,54,151,152,153,167,70,167,168,169,3,3,3,358,359,360,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,149,213,217,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348,339,404,404,404,404,404,404 </data> </layer> - <layer name="Ground2" width="150" height="125"> + <layer id="2" name="Ground2" width="150" height="125"> <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,1279,1274,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,928,942,943,0,0,941,929,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1279,1274,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,928,942,942,929,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -275,7 +275,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,1279,1274,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="150" height="125"> + <layer id="3" name="Ground3" width="150" height="125"> <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,1073,1073,1073,1073,1073,1073,1073,1082,1082,1082,0,0,1091,1073,1073,1073,1073,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1082,1073,1073,1073,1073,1073,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -404,7 +404,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 </data> </layer> - <layer name="Fringe" width="150" height="125"> + <layer id="4" name="Fringe" width="150" height="125"> <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,595,596,597,0,0,101,966,0,0,0,0,0,0,935,951,952,0,0,950,936,0,0,968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,138, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,982,920,0,0,919,983,983,983,920,935,951,951,936,0,919,983,984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -514,8 +514,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,101,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,681,0,0,0,0,0,0,0,0,0,0,0,672,0,0,105,0,0,0,0,0,0,0,0,0,0,1037,0,1008,0,0,0,0,0,0,0,0,522, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,681,0,0,0,0,0,0,0,0,0,0,0,682,0,0,106,0,0,0,0,0,0,0,0,0,0,1017,0,1008,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,697,0,0,0,0,0,0,0,0,0,0,0,698,0,0,105,0,0,0,665,0,0,0,0,0,666,1017,0,1008,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,515,516,0,0,633,0,0,0,0,0,0,0,0,0,0,0,636,0,0,106,0,0,0,681,0,0,0,0,0,682,1017,0,1038,0,681,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,649,651,650,650,650,650,650,650,650,650,650,700,652,0,0,106,0,0,0,697,0,0,0,0,0,698,1017,0,1038,0,681,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,516,0,0,633,0,0,0,0,0,0,0,0,0,0,0,636,0,0,106,0,0,0,681,0,0,0,0,0,682,1017,0,1038,0,681,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,649,651,650,650,650,650,650,650,650,650,650,700,652,0,0,106,0,0,0,697,0,0,0,0,0,698,1017,0,1038,0,681,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,633,0,0,0,0,0,636,1017,0,1038,0,681,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,598,599,600,0,0,0,0,0,0,106,0,0,0,649,650,650,650,650,650,652,1017,0,1038,0,681,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,101,0,598,599,600,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,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,104,0,0,0,0,0,0,0,0,0,0,1027,0,988,0,697,0,0,0,0,0,0,0, @@ -533,7 +533,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 </data> </layer> - <layer name="Over1" width="150" height="125"> + <layer id="5" name="Over1" width="150" height="125"> <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, @@ -643,7 +643,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,601,602,602,602,603,603,604,0,0,0,0,0,623,629,629,630,629,629,629, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,601,659,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,599,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,599,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -662,7 +662,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,336,336,336,336,336,336 </data> </layer> - <layer name="Over2" width="150" height="125"> + <layer id="6" name="Over2" width="150" height="125"> <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, @@ -791,7 +791,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,340,0,0,0,0,0 </data> </layer> - <layer name="Collision" width="150" height="125"> + <layer id="7" name="Collision" width="150" height="125" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -920,107 +920,107 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Object"> - <object name="Scorpion" type="spawn" x="2304" y="1632" width="608" height="320"> + <objectgroup id="8" name="Object" visible="0"> + <object id="1" name="Scorpion" type="spawn" x="2304" y="1632" width="608" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1"/> </properties> </object> - <object name="Scorpion" type="spawn" x="2944" y="2016" width="608" height="320"> + <object id="2" name="Scorpion" type="spawn" x="2944" y="2016" width="608" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1"/> </properties> </object> - <object name="Scorpion" type="spawn" x="2912" y="2560" width="608" height="320"> + <object id="3" name="Scorpion" type="spawn" x="2912" y="2560" width="608" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1"/> </properties> </object> - <object name="Scorpion" type="spawn" x="1760" y="768" width="448" height="672"> + <object id="4" name="Scorpion" type="spawn" x="1760" y="768" width="448" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1"/> </properties> </object> - <object name="SeaSlime" type="spawn" x="1600" y="192" width="352" height="1568"> + <object id="5" name="SeaSlime" type="spawn" x="1600" y="192" width="352" height="1568"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="31"/> </properties> </object> - <object name="Scorpion" type="spawn" x="1728" y="288" width="352" height="320"> + <object id="6" name="Scorpion" type="spawn" x="1728" y="288" width="352" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1"/> </properties> </object> - <object name="TameScorpion" type="spawn" x="1888" y="192" width="128" height="96"> + <object id="7" name="TameScorpion" type="spawn" x="1888" y="192" width="128" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="44"/> </properties> </object> - <object name="TameScorpion" type="spawn" x="2080" y="1536" width="128" height="96"> + <object id="8" name="TameScorpion" type="spawn" x="2080" y="1536" width="128" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="44"/> </properties> </object> - <object name="TameScorpion" type="spawn" x="2720" y="2272" width="704" height="320"> + <object id="9" name="TameScorpion" type="spawn" x="2720" y="2272" width="704" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="44"/> </properties> </object> - <object name="RedScorpion" type="spawn" x="2912" y="1696" width="608" height="320"> + <object id="10" name="RedScorpion" type="spawn" x="2912" y="1696" width="608" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="2"/> </properties> </object> - <object name="RedScorpion" type="spawn" x="2368" y="1920" width="608" height="320"> + <object id="11" name="RedScorpion" type="spawn" x="2368" y="1920" width="608" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="2"/> </properties> </object> - <object name="To Beach" type="warp" x="3200" y="3040" width="96" height="32"> + <object id="12" name="To Beach" type="warp" x="3200" y="3040" width="96" height="32"> <properties> <property name="dest_map" value="004-1"/> - <property name="dest_tile_x" value="68"/> - <property name="dest_tile_y" value="20"/> + <property name="dest_x" value="68"/> + <property name="dest_y" value="20"/> </properties> </object> - <object name="To Tulimshar Suburbs" type="warp" x="1824" y="128" width="96" height="32"> + <object id="13" name="To Tulimshar Suburbs" type="warp" x="1824" y="128" width="96" height="32"> <properties> <property name="dest_map" value="042-1"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="113"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="113"/> </properties> </object> </objectgroup> diff --git a/maps/042-1.tmx b/maps/042-1.tmx index fcc29933..55991f86 100644 --- a/maps/042-1.tmx +++ b/maps/042-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="160" height="141" tilewidth="32" tileheight="32" infinite="0" nextobjectid="24"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="160" height="141" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="24"> <properties> <property name="music" value="peace.ogg"/> <property name="name" value="Tulimshar Suburbs"/> @@ -19,7 +19,7 @@ <tileset firstgid="1377" source="../tilesets/water.tsx"/> <tileset firstgid="1542" source="../tilesets/water_overflow.tsx"/> <tileset firstgid="1614" source="../tilesets/desert_city_x2.tsx"/> - <layer name="Ground1" width="160" height="141"> + <layer id="1" name="Ground1" width="160" height="141"> <data encoding="csv"> 1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1540,1522,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,61,3,46,3,3,3,3,3,165,166,150,150,134,135,135,135,136,152,152,153,154,11,3,3,3,118,3,3,3,45,3,3,3,3,3,120,3,3,3,3,3,3,3,1524,1540,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, 1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1540,1522,3,134,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,118,3,3,3,3,3,3,3,3,3,3,9,11,3,166,150,150,151,151,151,152,152,168,169,170,9,11,3,3,134,118,3,3,3,3,3,45,3,120,136,3,3,3,3,3,3,3,1524,1540,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, @@ -164,7 +164,7 @@ 1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1540,1522,3,3,3,358,359,360,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,152,152,168,3,3,693,694,693,694,694,3,3,419,423,404,422,420,420,420,420,420,420,420,420,420,420,420,420,420,423,404,405,501,3,677,678,680,678,3,3,3,213,217,3,3,3,3,3,3,3,3,3,3,403,404,405,3,3,606,606,605,605,606 </data> </layer> - <layer name="Ground2" width="160" height="141"> + <layer id="2" name="Ground2" width="160" height="141"> <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,1519,1514,914,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,122,0,0,0,0,0,0,916,1512,1517,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1519,1514,914,133,0,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,105,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,138,0,0,0,0,0,0,916,1512,1517,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -309,7 +309,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,1519,1514,914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,106,0,0,0,643,0,0,0,0,0,644,0,0,0,0,0,0,623,629,629,629,629,624,0,0,0,0,0,0,0,0,0,0,671,0,0,0,0,672,0,0,0,0,0,649,650,650,650,650,699,650,652,0,1197,0,1168,0,681,0,0,0,0,0 </data> </layer> - <layer name="Ground3" width="160" height="141"> + <layer id="3" name="Ground3" width="160" height="141"> <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,114,186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -454,7 +454,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 </data> </layer> - <layer name="Ground4" width="160" height="141"> + <layer id="4" name="Ground4" width="160" height="141"> <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, @@ -599,7 +599,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 </data> </layer> - <layer name="Fringe" width="160" height="141"> + <layer id="5" name="Fringe" width="160" height="141"> <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,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -702,7 +702,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,0,0,0,0,0,0,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,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,598,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,520,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,599,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,596,597,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -744,7 +744,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,681,0,0,0,0,0 </data> </layer> - <layer name="Over1" width="160" height="141"> + <layer id="6" name="Over1" width="160" height="141"> <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, @@ -889,7 +889,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 </data> </layer> - <layer name="Over2" width="160" height="141"> + <layer id="7" name="Over2" width="160" height="141"> <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, @@ -1034,7 +1034,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 </data> </layer> - <layer name="Collision" width="160" height="141"> + <layer id="8" name="Collision" width="160" height="141" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1179,83 +1179,83 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="9" name="Objects" visible="0"> <object id="1" name="Maggot" type="spawn" x="2752" y="1984" width="1026" height="534"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="0"/> </properties> </object> <object id="2" name="Maggot" type="spawn" x="1672" y="1692" width="917" height="524"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="0"/> </properties> </object> <object id="3" name="BlackScorpion" type="spawn" x="2080" y="3136" width="256" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="7"/> </properties> </object> <object id="4" name="Scorpion" type="spawn" x="3072" y="2688" width="192" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="1"/> </properties> </object> <object id="5" name="TameScorpion" type="spawn" x="1440" y="1536" width="1216" height="992"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="44"/> </properties> </object> <object id="6" name="Scorpion" type="spawn" x="2656" y="3136" width="192" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="1"/> </properties> </object> <object id="7" name="Scorpion" type="spawn" x="3072" y="3104" width="192" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="1"/> </properties> </object> <object id="8" name="Scorpion" type="spawn" x="2528" y="2752" width="224" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="1"/> </properties> </object> <object id="9" name="BlackScorpion" type="spawn" x="2176" y="2688" width="192" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="7"/> </properties> </object> <object id="10" name="BlackScorpion" type="spawn" x="2400" y="1056" width="384" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="7"/> </properties> @@ -1263,15 +1263,15 @@ <object id="12" name="To Lighthouse Beach" type="warp" x="2048" y="640" width="64" height="32"> <properties> <property name="dest_map" value="023-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="143"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="143"/> </properties> </object> <object id="22" name="To Tulismhar Outskirts" type="warp" x="1376" y="3680" width="96" height="32"> <properties> <property name="dest_map" value="041-1"/> - <property name="dest_tile_x" value="58"/> - <property name="dest_tile_y" value="6"/> + <property name="dest_x" value="58"/> + <property name="dest_y" value="6"/> </properties> </object> <object id="23" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="2016" y="1472" width="32" height="32"/> diff --git a/maps/043-1.tmx b/maps/043-1.tmx index 1067e3d7..e0e5a7a9 100644 --- a/maps/043-1.tmx +++ b/maps/043-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="120" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="7"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="120" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="7"> <properties> <property name="minimap" value="graphics/minimaps/043-1.png"/> <property name="music" value="faith.ogg"/> @@ -1102,30 +1102,30 @@ <object id="1" name="To Beach" type="warp" x="1280" y="608" width="192" height="32"> <properties> <property name="dest_map" value="003-4"/> - <property name="dest_tile_x" value="114"/> - <property name="dest_tile_y" value="116"/> + <property name="dest_x" value="114"/> + <property name="dest_y" value="116"/> </properties> </object> <object id="2" name="SeaSlime" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="40000"/> + <property name="death" value="30000"/> + <property name="spawn" value="40000"/> <property name="max_beings" value="17"/> <property name="monster_id" value="31"/> </properties> </object> <object id="3" name="YellowSlime" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="60000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="5"/> </properties> </object> <object id="4" name="GreenSlime" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="60000"/> + <property name="death" value="60000"/> + <property name="spawn" value="60000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="3"/> </properties> diff --git a/maps/043-3.tmx b/maps/043-3.tmx index b672cdec..289eef2a 100644 --- a/maps/043-3.tmx +++ b/maps/043-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" nextobjectid="14"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="14"> <properties> <property name="music" value="cavesong.ogg"/> <property name="name" value="Sandy Dungeon Level 1"/> @@ -7,7 +7,7 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/cave2.tsx"/> <tileset firstgid="131" source="../tilesets/cave2_x2.tsx"/> - <layer name="Ground1" width="150" height="150"> + <layer id="1" name="Ground1" width="150" height="150"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -161,7 +161,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="150" height="150"> + <layer id="2" name="Ground2" width="150" height="150"> <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, @@ -315,7 +315,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 </data> </layer> - <layer name="Fringe" width="150" height="150"> + <layer id="3" name="Fringe" width="150" height="150"> <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, @@ -469,7 +469,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 </data> </layer> - <layer name="Over1" width="150" height="150"> + <layer id="4" name="Over1" width="150" height="150"> <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, @@ -623,7 +623,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 </data> </layer> - <layer name="Collision" width="150" height="150"> + <layer id="5" name="Collision" width="150" height="150"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -777,75 +777,75 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="6" name="Objects"> <object id="1" name="CaveMaggot" type="spawn" x="881" y="1202" width="808" height="593"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="20000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="54"/> </properties> </object> <object id="2" name="CaveMaggot" type="spawn" x="1028" y="1683" width="808" height="593"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="20000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="54"/> </properties> </object> <object id="3" name="CaveMaggot" type="spawn" x="770" y="2669" width="1130" height="895"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="20000"/> + <property name="death" value="20000"/> + <property name="spawn" value="20000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="54"/> </properties> </object> <object id="4" name="AngryScorpion" type="spawn" x="1590" y="2821" width="246" height="286"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="55"/> </properties> </object> <object id="5" name="AngryFireGoblin" type="spawn" x="2860" y="3442" width="870" height="667"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="106"/> </properties> </object> <object id="6" name="AngryScorpion" type="spawn" x="978" y="3072" width="246" height="286"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="55"/> </properties> </object> <object id="7" name="AngryFireGoblin" type="spawn" x="3349" y="2234" width="854" height="662"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="30000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="106"/> </properties> </object> <object id="8" name="RedSlime" type="spawn" x="3166" y="1164" width="1003" height="750"> <properties> - <property name="eA_death" value="35000"/> - <property name="eA_spawn" value="45000"/> + <property name="death" value="35000"/> + <property name="spawn" value="45000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="6"/> </properties> </object> <object id="9" name="GreenSlime" type="spawn" x="2368" y="1120" width="1312" height="608"> <properties> - <property name="eA_death" value="15000"/> - <property name="eA_spawn" value="30000"/> + <property name="death" value="15000"/> + <property name="spawn" value="30000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="3"/> </properties> @@ -853,29 +853,29 @@ <object id="10" name="Mine Camp" type="warp" x="992" y="832" width="32" height="32"> <properties> <property name="dest_map" value="002-3"/> - <property name="dest_tile_x" value="22"/> - <property name="dest_tile_y" value="86"/> + <property name="dest_x" value="22"/> + <property name="dest_y" value="86"/> </properties> </object> <object id="11" name="To Lower Level" type="warp" x="2464" y="960" width="32" height="32"> <properties> <property name="dest_map" value="043-4"/> - <property name="dest_tile_x" value="47"/> - <property name="dest_tile_y" value="67"/> + <property name="dest_x" value="47"/> + <property name="dest_y" value="67"/> </properties> </object> <object id="12" name="To Snake Cave" type="warp" x="3712" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="87"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="87"/> </properties> </object> <object id="13" name="To Snake Cave" type="warp" x="992" y="1184" width="64" height="32"> <properties> <property name="dest_map" value="005-3"/> - <property name="dest_tile_x" value="33"/> - <property name="dest_tile_y" value="85"/> + <property name="dest_x" value="33"/> + <property name="dest_y" value="85"/> </properties> </object> </objectgroup> diff --git a/maps/043-4.tmx b/maps/043-4.tmx index 6df15e34..b8963508 100644 --- a/maps/043-4.tmx +++ b/maps/043-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="220" height="200" tilewidth="32" tileheight="32" nextobjectid="38"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="220" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="38"> <properties> <property name="music" value="cavesong.ogg"/> <property name="name" value="Troll Cave"/> @@ -9,7 +9,7 @@ <tileset firstgid="131" source="../tilesets/cave2_x2.tsx"/> <tileset firstgid="163" source="../tilesets/cave2_bilevel.tsx"/> <tileset firstgid="419" source="../tilesets/cave2_sewer_mine.tsx"/> - <layer name="Ground1" width="220" height="200"> + <layer id="1" name="Ground1" width="220" height="200"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -213,7 +213,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,112,113,113,113,113,114,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="220" height="200"> + <layer id="2" name="Ground2" width="220" height="200"> <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, @@ -417,7 +417,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,181,0,0,0,0,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="220" height="200"> + <layer id="3" name="Fringe" width="220" height="200"> <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, @@ -621,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="220" height="200"> + <layer id="4" name="Over1" width="220" height="200"> <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, @@ -825,7 +825,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 </data> </layer> - <layer name="Collision" width="220" height="200"> + <layer id="5" name="Collision" width="220" height="200"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1029,7 +1029,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="6" name="Objects" visible="0"> <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1632" y="1376" width="32" height="32"/> <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1632" y="1216" width="32" height="32"/> <object id="3" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1440" y="1216" width="32" height="32"/> @@ -1040,182 +1040,182 @@ <object id="8" name="To Upper Level" type="warp" x="1504" y="2176" width="32" height="32"> <properties> <property name="dest_map" value="043-3"/> - <property name="dest_tile_x" value="77"/> - <property name="dest_tile_y" value="31"/> + <property name="dest_x" value="77"/> + <property name="dest_y" value="31"/> </properties> </object> <object id="9" name="Terranite" type="spawn" x="4362" y="5144" width="265" height="247"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="240000"/> + <property name="death" value="120000"/> + <property name="spawn" value="240000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="60"/> </properties> </object> <object id="10" name="UndeadTroll" type="spawn" x="4053" y="1196" width="480" height="562"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="115"/> </properties> </object> <object id="11" name="UndeadTroll" type="spawn" x="2777" y="4293" width="395" height="373"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="115"/> </properties> </object> <object id="12" name="UndeadTroll" type="spawn" x="985" y="3681" width="381" height="402"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="115"/> </properties> </object> <object id="13" name="UndeadWitch" type="spawn" x="1206" y="4428" width="419" height="399"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="114"/> </properties> </object> <object id="14" name="UndeadWitch" type="spawn" x="3137" y="4772" width="320" height="340"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="114"/> </properties> </object> <object id="15" name="UndeadWitch" type="spawn" x="4337" y="4919" width="483" height="437"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="114"/> </properties> </object> <object id="16" name="UndeadWitch" type="spawn" x="4545" y="855" width="568" height="516"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="120000"/> + <property name="death" value="60000"/> + <property name="spawn" value="120000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="114"/> </properties> </object> <object id="17" name="UndeadTroll" type="spawn" x="3170" y="1402" width="300" height="790"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="115"/> </properties> </object> <object id="18" name="Troll" type="spawn" x="1188" y="1062" width="694" height="372"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="52"/> </properties> </object> <object id="19" name="Snake" type="spawn" x="3033" y="2514" width="298" height="520"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="8"/> </properties> </object> <object id="20" name="Troll" type="spawn" x="3107" y="1423" width="520" height="913"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="52"/> </properties> </object> <object id="21" name="BlackScorpion" type="spawn" x="2734" y="1917" width="349" height="385"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="7"/> </properties> </object> <object id="22" name="Troll" type="spawn" x="4093" y="1033" width="1076" height="947"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="52"/> </properties> </object> <object id="23" name="BlackScorpion" type="spawn" x="4513" y="2961" width="887" height="970"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="7"/> </properties> </object> <object id="24" name="Snake" type="spawn" x="4965" y="2139" width="536" height="797"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="8"/> </properties> </object> <object id="25" name="BlackScorpion" type="spawn" x="4713" y="4447" width="387" height="366"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="7"/> </properties> </object> <object id="26" name="Snake" type="spawn" x="4930" y="5053" width="365" height="314"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="8"/> </properties> </object> <object id="27" name="Troll" type="spawn" x="2844" y="4101" width="728" height="722"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="52"/> </properties> </object> <object id="28" name="Troll" type="spawn" x="1152" y="3010" width="638" height="855"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="52"/> </properties> </object> <object id="29" name="BlackScorpion" type="spawn" x="986" y="4191" width="649" height="584"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="7"/> </properties> </object> <object id="30" name="Troll" type="spawn" x="3807" y="3607" width="1000" height="777"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="50000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="52"/> </properties> @@ -1227,22 +1227,22 @@ <object id="35" name="To Deeper Level" type="warp" x="4896" y="864" width="32" height="32"> <properties> <property name="dest_map" value="043-4"/> - <property name="dest_tile_x" value="193"/> - <property name="dest_tile_y" value="32"/> + <property name="dest_x" value="193"/> + <property name="dest_y" value="32"/> </properties> </object> <object id="36" name="To Upper Level" type="warp" x="6176" y="1056" width="32" height="32"> <properties> <property name="dest_map" value="043-4"/> - <property name="dest_tile_x" value="153"/> - <property name="dest_tile_y" value="28"/> + <property name="dest_x" value="153"/> + <property name="dest_y" value="28"/> </properties> </object> <object id="37" name="To Witch Cave" type="warp" x="6208" y="768" width="32" height="32"> <properties> <property name="dest_map" value="043-5"/> - <property name="dest_tile_x" value="30"/> - <property name="dest_tile_y" value="107"/> + <property name="dest_x" value="30"/> + <property name="dest_y" value="107"/> </properties> </object> </objectgroup> diff --git a/maps/045-1.tmx b/maps/045-1.tmx index 5f8b81d5..ffc3f347 100644 --- a/maps/045-1.tmx +++ b/maps/045-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="19"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="19"> <properties> <property name="music" value="explorers-melody.ogg"/> <property name="name" value="Deep Snow Forest"/> @@ -1249,109 +1249,109 @@ <object id="1" name="To Snow Forest" type="warp" x="5600" y="1888" width="32" height="64"> <properties> <property name="dest_map" value="034-1"/> - <property name="dest_tile_x" value="16"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="16"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="2" name="To Snow Forest" type="warp" x="5664" y="4192" width="32" height="96"> <properties> <property name="dest_map" value="034-1"/> - <property name="dest_tile_x" value="17"/> - <property name="dest_tile_y" value="102"/> + <property name="dest_x" value="17"/> + <property name="dest_y" value="102"/> </properties> </object> <object id="3" name="Wolvern" type="spawn" x="2912" y="3552" width="768" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="88"/> </properties> </object> <object id="4" name="Wolvern" type="spawn" x="2784" y="2112" width="768" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="88"/> </properties> </object> <object id="5" name="Wolvern" type="spawn" x="4352" y="1664" width="768" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="88"/> </properties> </object> <object id="6" name="Wolvern" type="spawn" x="1568" y="2752" width="768" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="88"/> </properties> </object> <object id="7" name="Wolvern" type="spawn" x="3040" y="1056" width="768" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="88"/> </properties> </object> <object id="8" name="Wolvern" type="spawn" x="3904" y="2624" width="768" height="736"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="88"/> </properties> </object> <object id="9" name="Wolvern" type="spawn" x="928" y="2208" width="608" height="512"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="88"/> </properties> </object> <object id="10" name="Wolvern" type="spawn" x="1632" y="1664" width="608" height="512"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="88"/> </properties> </object> <object id="11" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="40"/> <property name="monster_id" value="36"/> </properties> </object> <object id="12" name="Reinboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="30"/> <property name="monster_id" value="92"/> </properties> </object> <object id="13" name="Fluffy" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="40"/> <property name="monster_id" value="18"/> </properties> </object> <object id="14" name="WhiteBell" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="93"/> </properties> @@ -1359,30 +1359,30 @@ <object id="15" name="To Woodland Hills" type="warp" x="768" y="5728" width="128" height="32"> <properties> <property name="dest_map" value="017-1"/> - <property name="dest_tile_x" value="182"/> - <property name="dest_tile_y" value="17"/> + <property name="dest_x" value="182"/> + <property name="dest_y" value="17"/> </properties> </object> <object id="16" name="IceGoblin" type="spawn" x="1120" y="4256" width="832" height="832"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="56"/> </properties> </object> <object id="17" name="IceGoblin" type="spawn" x="4416" y="3648" width="832" height="800"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="56"/> </properties> </object> <object id="18" name="IceGoblin" type="spawn" x="2080" y="4608" width="2560" height="352"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="56"/> </properties> diff --git a/maps/046-1.tmx b/maps/046-1.tmx index 9f3dc248..87f81036 100644 --- a/maps/046-1.tmx +++ b/maps/046-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="178" height="135" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="22"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="178" height="135" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="22"> <properties> <property name="music" value="explorers-melody.ogg"/> <property name="name" value="Rock Plateau"/> @@ -870,56 +870,56 @@ <objectgroup id="7" name="Objects" visible="0"> <object id="1" name="Reinboo" type="spawn" x="0" y="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="40"/> <property name="monster_id" value="92"/> </properties> </object> <object id="2" name="Fluffy" type="spawn" x="0" y="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="50"/> <property name="monster_id" value="18"/> </properties> </object> <object id="3" name="Squirrel" type="spawn" x="0" y="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="50"/> <property name="monster_id" value="36"/> </properties> </object> <object id="4" name="Moggun" type="spawn" x="576" y="800" width="1696" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="12"/> <property name="monster_id" value="59"/> </properties> </object> <object id="5" name="Yeti" type="spawn" x="0" y="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="6" name="Wolvern" type="spawn" x="2432" y="3040" width="768" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="88"/> </properties> </object> <object id="7" name="WhiteBell" type="spawn" x="0" y="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="9"/> <property name="monster_id" value="93"/> </properties> @@ -927,94 +927,94 @@ <object id="8" name="To Snow Forest" type="warp" x="3008" y="3968" width="64" height="32"> <properties> <property name="dest_map" value="034-1"/> - <property name="dest_tile_x" value="94"/> - <property name="dest_tile_y" value="19"/> + <property name="dest_x" value="94"/> + <property name="dest_y" value="19"/> </properties> </object> <object id="9" name="To Highlands" type="warp" x="928" y="640" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="70"/> - <property name="dest_tile_y" value="178"/> + <property name="dest_x" value="70"/> + <property name="dest_y" value="178"/> </properties> </object> <object id="10" name="To Highlands" type="warp" x="992" y="640" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="70"/> - <property name="dest_tile_y" value="178"/> + <property name="dest_x" value="70"/> + <property name="dest_y" value="178"/> </properties> </object> <object id="11" name="To Frosty Underground" type="warp" x="2496" y="1184" width="32" height="32"> <properties> <property name="dest_map" value="046-3"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="29"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="29"/> </properties> </object> <object id="12" name="To Frosty Underground" type="warp" x="4192" y="1760" width="32" height="32"> <properties> <property name="dest_map" value="046-3"/> - <property name="dest_tile_x" value="131"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="131"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="13" name="To Frosty Underground" type="warp" x="4192" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="046-3"/> - <property name="dest_tile_x" value="131"/> - <property name="dest_tile_y" value="54"/> + <property name="dest_x" value="131"/> + <property name="dest_y" value="54"/> </properties> </object> <object id="14" name="To Frosty Underground" type="warp" x="4448" y="832" width="32" height="32"> <properties> <property name="dest_map" value="046-3"/> - <property name="dest_tile_x" value="139"/> - <property name="dest_tile_y" value="18"/> + <property name="dest_x" value="139"/> + <property name="dest_y" value="18"/> </properties> </object> <object id="15" name="To Frosty Underground" type="warp" x="2656" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="046-3"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="42"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="42"/> </properties> </object> <object id="16" name="To Frosty Underground" type="warp" x="3968" y="3712" width="32" height="32"> <properties> <property name="dest_map" value="046-3"/> - <property name="dest_tile_x" value="124"/> - <property name="dest_tile_y" value="108"/> + <property name="dest_x" value="124"/> + <property name="dest_y" value="108"/> </properties> </object> <object id="17" name="Wolvern" type="spawn" x="2080" y="1696" width="512" height="416"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="88"/> </properties> </object> <object id="18" name="Wolvern" type="spawn" x="992" y="3456" width="352" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="88"/> </properties> </object> <object id="19" name="Wolvern" type="spawn" x="2976" y="768" width="1472" height="1088"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="88"/> </properties> </object> <object id="20" name="Wolvern" type="spawn" x="4480" y="2016" width="352" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="88"/> </properties> @@ -1022,8 +1022,8 @@ <object id="21" name="To Frosty Underground" type="warp" x="1984" y="832" width="32" height="32"> <properties> <property name="dest_map" value="019-4"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="123"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="123"/> </properties> </object> </objectgroup> diff --git a/maps/046-3.tmx b/maps/046-3.tmx index 31a56678..ef0e4e40 100644 --- a/maps/046-3.tmx +++ b/maps/046-3.tmx @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="178" height="128" tilewidth="32" tileheight="32" nextobjectid="22"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="178" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="22"> <properties> - <property name="name" value="Frosty Underground"/> <property name="music" value="explorers-melody.ogg"/> + <property name="name" value="Frosty Underground"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/icecave.tsx"/> - <layer name="Ground1" width="178" height="128"> + <layer id="1" name="Ground1" width="178" height="128"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -138,7 +138,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="178" height="128"> + <layer id="2" name="Fringe" width="178" height="128"> <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, @@ -270,7 +270,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 </data> </layer> - <layer name="Over1" width="178" height="128"> + <layer id="3" name="Over1" width="178" height="128"> <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, @@ -402,7 +402,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 </data> </layer> - <layer name="Collision" width="178" height="128"> + <layer id="4" name="Collision" width="178" height="128"> <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,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -534,165 +534,165 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="5" name="Objects"> <object id="1" name="To Outside" type="warp" x="4448" y="608" width="32" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="139"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="139"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="2" name="To Outside" type="warp" x="2496" y="960" width="32" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="38"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="38"/> </properties> </object> <object id="3" name="To Outside" type="warp" x="2656" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="51"/> </properties> </object> <object id="4" name="To Outside" type="warp" x="4192" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="131"/> - <property name="dest_tile_y" value="56"/> + <property name="dest_x" value="131"/> + <property name="dest_y" value="56"/> </properties> </object> <object id="5" name="To Outside" type="warp" x="4192" y="1760" width="32" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="131"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="131"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="6" name="To Outside" type="warp" x="3968" y="3488" width="32" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="124"/> - <property name="dest_tile_y" value="117"/> + <property name="dest_x" value="124"/> + <property name="dest_y" value="117"/> </properties> </object> <object id="7" name="Yeti" type="spawn" x="1984" y="3104" width="416" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="8" name="IceGoblin" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="56"/> </properties> </object> <object id="9" name="Moggun" type="spawn" x="1376" y="1536" width="832" height="864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="14"/> <property name="monster_id" value="59"/> </properties> </object> <object id="10" name="IceElement" type="spawn" x="3744" y="3264" width="192" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="69"/> </properties> </object> <object id="11" name="WhiteSlime" type="spawn" x="4096" y="2176" width="320" height="256"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="91"/> </properties> </object> <object id="12" name="BlueSlime" type="spawn" x="3200" y="2592" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="13" name="WhiteSlime" type="spawn" x="3040" y="2400" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="91"/> </properties> </object> <object id="14" name="WhiteSlime" type="spawn" x="2144" y="2560" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="91"/> </properties> </object> <object id="15" name="WhiteSlime" type="spawn" x="3296" y="1024" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="91"/> </properties> </object> <object id="16" name="WhiteSlime" type="spawn" x="960" y="1120" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="91"/> </properties> </object> <object id="17" name="BlueSlime" type="spawn" x="4384" y="3232" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="18" name="BlueSlime" type="spawn" x="4640" y="1632" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="19" name="BlueSlime" type="spawn" x="2464" y="1568" width="480" height="320"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="20" name="IceElement" type="spawn" x="1280" y="576" width="512" height="352"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="69"/> </properties> </object> <object id="21" name="Yeti" type="spawn" x="3424" y="1408" width="416" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> diff --git a/maps/047-1.tmx b/maps/047-1.tmx index 3ad084be..965de8da 100644 --- a/maps/047-1.tmx +++ b/maps/047-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="225" height="200" tilewidth="32" tileheight="32" nextobjectid="37"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="225" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="37"> <properties> <property name="music" value="explorers-melody.ogg"/> <property name="name" value="snow Hills"/> @@ -13,7 +13,7 @@ <tileset firstgid="612" source="../tilesets/snow_docks.tsx"/> <tileset firstgid="772" source="../tilesets/snow_village.tsx"/> <tileset firstgid="1028" source="../tilesets/snow_village_x4.tsx"/> - <layer name="Ground1" width="225" height="200"> + <layer id="1" name="Ground1" width="225" height="200"> <data encoding="csv"> 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,148,148,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,70,70,86,86,70,70,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,148,148,148,595,595,595,595,595,595,595,595,595,595,595,595,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,70,86,86,70,70,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, @@ -217,7 +217,7 @@ 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86 </data> </layer> - <layer name="Ground2" width="225" height="200"> + <layer id="2" name="Ground2" width="225" height="200"> <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,147,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,132,133,0,0,0,131,132,133,0,149,0,0,0,0,0,0,0,147,0,0,0,0,195,196,196,196,196,197,0,0,131,132,132,151,0,0,0,0,0,0,0,0,0,0,150,133,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,179,163,164,164,164,164,164,164,164,164,164,164,164,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,132,132,132,151,0,149,0,149,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,131,132,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,134,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,196,196,196,196,196,196,196,196,196,196,196,196,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -421,7 +421,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,195,179,180,180,180,163,164,164,164,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,197,0,0,0,0,0,0,0,0,0,0,0,147,148,148,148,148,148,148,148,148,148,149,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,195,196,196,196,196,179,180,180,180,181,196,196,196,196,196,196,196,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Fringe" width="225" height="200" visible="0"> + <layer id="3" name="Fringe" width="225" height="200"> <data encoding="csv"> 0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,275,0,0,0,0,0,0,0,0,277,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,277,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -600,8 +600,8 @@ 0,0,275,0,0,0,275,0,0,275,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,0,276,0,0,277,0,0,0,0,275,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,275,0,276,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,265,0,0,0,276,0,275,0,276,0,276,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,275,0,0,276,0,275,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,276,0,0,0,0,0,0,0,0,276,0,0,0,0,276,0,276,0,0,0,276,0,276,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,275,0,0,0,275,0,0,275,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,277,0,0,276,0,0,275,0,0,0,275,0,0,276,0,0,0,275,0,0,0,0,0,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,276,0,0,276,0,0,0,0,0,276,0,276,0,0,0,0,275,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,275,0,0,0,276,0,275,0,276,0,0,277,0,0,275,0,0,0,0,262,0,267,0,275,0,0,0,0,0,276,275,275,0,0,0,276,0,0,0,0,0,0,0,276,0,0,0,276,0,0,276,0,276,0,0,276,0,0,276,0,0,0,0,0,3,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,275,0,0,0,0,0,0,275,0,276,0,0,0,0,0,0,0,276,0,0,0,275,0,276,0,0,275,0,275,0,0,0,0,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,275,0,276,0,275,0,0,0,276,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,276,0,276,0,0,275,0,275,0,0,0,0,0,275,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -275,0,0,0,0,276,275,0,276,0,0,0,0,0,276,0,276,0,276,0,0,276,0,0,0,0,275,0,276,0,0,275,0,275,0,0,4,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,275,0,276,0,275,0,0,0,278,275,0,276,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,275,0,0,275,0,0,0,0,275,0,275,0,0,0,275,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,275,0,0,0,0,0,0,275,0,276,0,0,0,0,0,0,0,276,0,0,0,275,0,276,0,0,275,0,275,0,0,0,0,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,275,0,276,0,275,0,0,0,276,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,276,0,276,0,0,275,0,275,0,0,0,0,0,275,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +275,0,0,0,0,276,275,0,276,0,0,0,0,0,276,0,276,0,276,0,0,276,0,0,0,0,275,0,276,0,0,275,0,275,0,0,4,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,275,0,276,0,275,0,0,0,278,275,0,276,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,275,0,0,275,0,0,0,0,275,0,275,0,0,0,275,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,276,0,0,0,0,0,0,276,0,0,276,0,0,0,0,0,0,275,0,275,0,0,0,0,0,0,0,275,0,0,275,0,275,0,0,0,0,0,0,0,0,0,0,0,276,0,275,0,276,0,0,0,0,0,0,0,275,0,276,0,0,0,277,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,276,0,275,0,275,0,0,0,0,0,275,0,0,276,0,0,0,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,275,0,0,276,275,0,276,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,276,0,276,0,0,275,0,0,275,0,0,0,0,0,275,0,0,275,0,0,0,0,276,0,276,0,276,0,0,276,0,0,0,0,0,276,0,0,275,0,0,0,0,276,0,275,0,263,264,0,0,275,0,0,276,0,276,0,0,0,0,276,0,0,0,275,0,0,0,0,268,0,263,264,277,0,0,0,0,0,0,0,0,0,0,278,276,0,276,0,0,0,275,0,0,276,0,275,0,275,0,276,0,0,0,4,0,0,0,0,0,0,0,276,0,275,0,275,0,0,275,0,276,0,275,0,276,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,275,0,0,275,0,0,0,276,0,0,276,0,0,276,0,0,276,0,275,0,0,0,0,0,0,0,275,0,275,0,276,0,275,0,276,0,0,276,0,275,0,0,0,0,0,275,0,0,278,0,0,275,0,0,275,0,276,0,0,0,276,0,0,0,0,266,0,0,0,276,0,267,0,0,275,0,263,264,0,276,0,275,0,0,0,0,0,276,0,0,0,275,0,0,0,276,278,0,0,275,0,0,0,0,0,0,0,0,0,0,275,0,0,276,0,0,263,264,0,0,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -625,7 +625,7 @@ 275,0,276,0,0,276,0,276,0,0,0,276,0,0,276,0,0,0,275,0,0,0,276,0,0,276,0,275,275,0,0,0,276,0,0,0,275,0,0,275,0,0,0,275,0,276,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,278,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,276,0,0,0,0,0,0 </data> </layer> - <layer name="Over1" width="225" height="200" visible="0"> + <layer id="4" name="Over1" width="225" height="200"> <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, @@ -829,7 +829,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 </data> </layer> - <layer name="Over2" width="225" height="200" visible="0"> + <layer id="5" name="Over2" width="225" height="200"> <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, @@ -1033,7 +1033,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 </data> </layer> - <layer name="Over3" width="225" height="200" visible="0"> + <layer id="6" name="Over3" width="225" height="200"> <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, @@ -1237,7 +1237,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 </data> </layer> - <layer name="Collision" width="225" height="200"> + <layer id="7" name="Collision" width="225" height="200" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1407,7 +1407,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,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,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,0,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,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,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,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,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,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,0,0,0,0,0,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,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,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,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,0,0,0,0,0,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,0,0,0,2,2,0,0,0,0,2,2,0,2,2,2,2,2,2,2,2,2,2,2,0,0,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,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,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,2,2,2,2,2,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,0,0,2,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,2,2,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,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,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,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,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,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,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,0,0,0,0,0,0,0,2,2,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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, @@ -1415,7 +1415,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,0,0,0,0,2,2,0,2,2,2,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,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,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,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,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,0,0,0,2,2,0,0,0,2,2,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,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,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,0,0,0,0,0,0,0,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,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,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,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,2,2,0,0,2,2,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, -2,2,2,2,2,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,0,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,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,0,0,2,2,0,2,2,2,2,2,2,2,0,2,2,0,0,0,0,2,0,0,0,2,2,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,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,0,0,2,2,0,2,2,2,2,2,2,2,0,2,2,0,0,0,0,2,0,0,0,2,2,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,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,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,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,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,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,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,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,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,2,0,0,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,2,2,2,2,2,2,2,2,2,0,0,2,2,0,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1441,193 +1441,193 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="8" name="Objects" visible="0"> <object id="1" name="To Small Cave" type="warp" x="3456" y="5280" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="110"/> - <property name="dest_tile_y" value="102"/> + <property name="dest_x" value="110"/> + <property name="dest_y" value="102"/> </properties> </object> <object id="2" name="To Small Cave" type="warp" x="3456" y="4992" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="119"/> - <property name="dest_tile_y" value="94"/> + <property name="dest_x" value="119"/> + <property name="dest_y" value="94"/> </properties> </object> <object id="3" name="To Small Cave" type="warp" x="3264" y="3552" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="119"/> - <property name="dest_tile_y" value="58"/> + <property name="dest_x" value="119"/> + <property name="dest_y" value="58"/> </properties> </object> <object id="4" name="To Small Cave" type="warp" x="3264" y="3424" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="128"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="128"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="5" name="To Deeper Snow Cave" type="warp" x="4928" y="2944" width="32" height="32"> <properties> <property name="dest_map" value="019-4"/> - <property name="dest_tile_x" value="74"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="74"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="6" name="To Snow Hills Cave" type="warp" x="3232" y="4576" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="126"/> - <property name="dest_tile_y" value="180"/> + <property name="dest_x" value="126"/> + <property name="dest_y" value="180"/> </properties> </object> <object id="7" name="To Snow Hills Cave" type="warp" x="1184" y="5536" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="33"/> - <property name="dest_tile_y" value="175"/> + <property name="dest_x" value="33"/> + <property name="dest_y" value="175"/> </properties> </object> <object id="8" name="To Snow Hills Cave" type="warp" x="1440" y="2336" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="46"/> - <property name="dest_tile_y" value="76"/> + <property name="dest_x" value="46"/> + <property name="dest_y" value="76"/> </properties> </object> <object id="9" name="To Snow Hills Cave" type="warp" x="2496" y="3488" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="41"/> </properties> </object> <object id="10" name="To Snow Hills Cave" type="warp" x="2656" y="3936" width="32" height="32"> <properties> <property name="dest_map" value="047-3"/> - <property name="dest_tile_x" value="108"/> - <property name="dest_tile_y" value="165"/> + <property name="dest_x" value="108"/> + <property name="dest_y" value="165"/> </properties> </object> <object id="11" name="WhiteSlime" type="spawn" x="1152" y="5568" width="128" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="12" name="BlueSlime" type="spawn" x="1408" y="2368" width="96" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="89"/> </properties> </object> <object id="13" name="Reinboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="50"/> <property name="monster_id" value="92"/> </properties> </object> <object id="14" name="Fluffy" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="60"/> <property name="monster_id" value="18"/> </properties> </object> <object id="15" name="Squirrel" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="60"/> <property name="monster_id" value="36"/> </properties> </object> <object id="16" name="Moggun" type="spawn" x="960" y="3104" width="3328" height="1824"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="25"/> <property name="monster_id" value="59"/> </properties> </object> <object id="17" name="Wolvern" type="spawn" x="5664" y="3360" width="832" height="1184"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="88"/> </properties> </object> <object id="18" name="Wolvern" type="spawn" x="4736" y="3360" width="832" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="88"/> </properties> </object> <object id="19" name="Wolvern" type="spawn" x="4640" y="4736" width="1568" height="1024"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="88"/> </properties> </object> <object id="20" name="Wolvern" type="spawn" x="1088" y="1792" width="1568" height="1024"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="88"/> </properties> </object> <object id="21" name="Wolvern" type="spawn" x="3584" y="3328" width="672" height="800"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="88"/> </properties> </object> <object id="22" name="Wolvern" type="spawn" x="3136" y="5216" width="832" height="672"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="88"/> </properties> </object> <object id="23" name="WhiteSlime" type="spawn" x="3424" y="5344" width="128" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="24" name="BlueSlime" type="spawn" x="3424" y="5024" width="128" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="89"/> </properties> </object> <object id="25" name="WhiteBell" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="93"/> </properties> @@ -1635,14 +1635,14 @@ <object id="26" name="To Rock Plateau" type="warp" x="2240" y="5728" width="96" height="32"> <properties> <property name="dest_map" value="046-1"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="27" name="Yeti" type="spawn" x="2208" y="3264" width="1184" height="1152"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> @@ -1650,61 +1650,61 @@ <object id="28" name="To Blue Sage Mansion" type="warp" x="4160" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="130"/> - <property name="dest_tile_y" value="47"/> + <property name="dest_x" value="130"/> + <property name="dest_y" value="47"/> </properties> </object> <object id="29" name="To Snow Hills" type="warp" x="4160" y="1536" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="130"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="130"/> + <property name="dest_y" value="51"/> </properties> </object> <object id="30" name="WhiteSlime" type="spawn" x="4384" y="672" width="96" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="91"/> </properties> </object> <object id="31" name="WhiteSlime" type="spawn" x="4992" y="2080" width="96" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="91"/> </properties> </object> <object id="32" name="BlueSlime" type="spawn" x="5504" y="1408" width="160" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="33" name="BlueSlime" type="spawn" x="4512" y="1312" width="160" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="34" name="WhiteSlime" type="spawn" x="3872" y="1920" width="96" height="96"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="91"/> </properties> </object> <object id="35" name="BlueSlime" type="spawn" x="4160" y="2176" width="160" height="192"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> @@ -1712,8 +1712,8 @@ <object id="36" name="To Blue Sage" type="warp" x="4096" y="1248" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="40"/> - <property name="dest_tile_y" value="48"/> + <property name="dest_x" value="40"/> + <property name="dest_y" value="48"/> </properties> </object> </objectgroup> diff --git a/maps/047-3.tmx b/maps/047-3.tmx index d456ab56..5c2de5e3 100644 --- a/maps/047-3.tmx +++ b/maps/047-3.tmx @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="160" height="200" tilewidth="32" tileheight="32" nextobjectid="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="160" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="32"> <properties> <property name="music" value="explorers-melody.ogg"/> <property name="name" value="Snow Hills Cave"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/icecave.tsx"/> - <layer name="Ground1" width="160" height="200"> + <layer id="1" name="Ground1" width="160" height="200"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -210,7 +210,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="160" height="200"> + <layer id="2" name="Fringe" width="160" height="200"> <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, @@ -414,7 +414,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 </data> </layer> - <layer name="Over1" width="160" height="200"> + <layer id="3" name="Over1" width="160" height="200"> <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, @@ -618,7 +618,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 </data> </layer> - <layer name="Collision" width="160" height="200"> + <layer id="4" name="Collision" width="160" height="200"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -822,234 +822,234 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="5" name="Objects"> <object id="1" name="To Snow Hills" type="warp" x="1472" y="2368" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="45"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="45"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="2" name="To Snow Hills" type="warp" x="1056" y="5632" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="37"/> - <property name="dest_tile_y" value="174"/> + <property name="dest_x" value="37"/> + <property name="dest_y" value="174"/> </properties> </object> <object id="3" name="To Snow Hills" type="warp" x="4032" y="5792" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="101"/> - <property name="dest_tile_y" value="144"/> + <property name="dest_x" value="101"/> + <property name="dest_y" value="144"/> </properties> </object> <object id="4" name="To Snow Hills" type="warp" x="1120" y="1344" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="78"/> - <property name="dest_tile_y" value="110"/> + <property name="dest_x" value="78"/> + <property name="dest_y" value="110"/> </properties> </object> <object id="5" name="To Snow Hills" type="warp" x="3456" y="5216" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="83"/> - <property name="dest_tile_y" value="125"/> + <property name="dest_x" value="83"/> + <property name="dest_y" value="125"/> </properties> </object> <object id="6" name="To Snow Hills" type="warp" x="3520" y="3296" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="108"/> - <property name="dest_tile_y" value="166"/> + <property name="dest_x" value="108"/> + <property name="dest_y" value="166"/> </properties> </object> <object id="7" name="To Snow Hills" type="warp" x="3808" y="3040" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="108"/> - <property name="dest_tile_y" value="157"/> + <property name="dest_x" value="108"/> + <property name="dest_y" value="157"/> </properties> </object> <object id="8" name="To Snow Hills" type="warp" x="3808" y="1888" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="102"/> - <property name="dest_tile_y" value="112"/> + <property name="dest_x" value="102"/> + <property name="dest_y" value="112"/> </properties> </object> <object id="9" name="To Snow Hills" type="warp" x="4096" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="102"/> - <property name="dest_tile_y" value="108"/> + <property name="dest_x" value="102"/> + <property name="dest_y" value="108"/> </properties> </object> <object id="10" name="WhiteSlime" type="spawn" x="1664" y="4192" width="320" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="11" name="WhiteSlime" type="spawn" x="1024" y="4800" width="224" height="224"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="12" name="WhiteSlime" type="spawn" x="1120" y="3200" width="320" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="13" name="WhiteSlime" type="spawn" x="2208" y="4768" width="320" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="14" name="WhiteSlime" type="spawn" x="2016" y="3296" width="128" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="15" name="BlueSlime" type="spawn" x="672" y="5312" width="224" height="160"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="16" name="BlueSlime" type="spawn" x="2720" y="4256" width="192" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="17" name="BlueSlime" type="spawn" x="1696" y="3872" width="192" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="18" name="BlueSlime" type="spawn" x="1056" y="4064" width="192" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="19" name="BlueSlime" type="spawn" x="1632" y="2656" width="192" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="20" name="Moggun" type="spawn" x="2080" y="3936" width="704" height="864"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="59"/> </properties> </object> <object id="21" name="Moggun" type="spawn" x="576" y="672" width="1376" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="12"/> <property name="monster_id" value="59"/> </properties> </object> <object id="22" name="IceSkull" type="spawn" x="1216" y="960" width="192" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="1085"/> </properties> </object> <object id="23" name="Yeti" type="spawn" x="3584" y="4768" width="704" height="544"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="70"/> </properties> </object> <object id="24" name="IceSkull" type="spawn" x="3040" y="5120" width="512" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="1085"/> </properties> </object> <object id="25" name="IceElement" type="spawn" x="3264" y="2400" width="512" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="69"/> </properties> </object> <object id="26" name="BlueSlime" type="spawn" x="3872" y="2848" width="192" height="128"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="89"/> </properties> </object> <object id="27" name="WhiteSlime" type="spawn" x="3360" y="2976" width="320" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> </object> <object id="28" name="Moggun" type="spawn" x="3136" y="992" width="1376" height="704"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="59"/> </properties> </object> <object id="29" name="IceSkull" type="spawn" x="1024" y="2784" width="1280" height="480"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="1085"/> </properties> </object> <object id="30" name="WhiteSlime" type="spawn" x="3744" y="5376" width="320" height="288"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="91"/> </properties> diff --git a/maps/048-2.tmx b/maps/048-2.tmx index 3e18fe25..a5fd8123 100644 --- a/maps/048-2.tmx +++ b/maps/048-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="220" height="220" tilewidth="32" tileheight="32" nextobjectid="19"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="220" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="19"> <properties> <property name="music" value="white-christmas.ogg"/> <property name="name" value="Blue Sages' Mansion"/> @@ -10,7 +10,7 @@ <tileset firstgid="515" source="../tilesets/inn_x2.tsx"/> <tileset firstgid="563" source="../tilesets/inn_x3.tsx"/> <tileset firstgid="643" source="../tilesets/inn_x4.tsx"/> - <layer name="Ground1" width="220" height="220"> + <layer id="1" name="Ground1" width="220" height="220"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -234,7 +234,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="220" height="220"> + <layer id="2" name="Ground2" width="220" height="220"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -458,7 +458,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground3" width="220" height="220"> + <layer id="3" name="Ground3" width="220" height="220"> <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, @@ -682,7 +682,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 </data> </layer> - <layer name="Ground4" width="220" height="220"> + <layer id="4" name="Ground4" width="220" height="220"> <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, @@ -906,7 +906,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 </data> </layer> - <layer name="Fringe" width="220" height="220"> + <layer id="5" name="Fringe" width="220" height="220"> <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, @@ -1130,7 +1130,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 </data> </layer> - <layer name="Over1" width="220" height="220"> + <layer id="6" name="Over1" width="220" height="220"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -1354,7 +1354,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Collision" width="220" height="220" visible="0"> + <layer id="7" name="Collision" width="220" height="220" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1578,124 +1578,124 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="8" name="Objects" visible="0"> <object id="1" name="To Second Floor" type="warp" x="672" y="2496" width="64" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="84"/> - <property name="dest_tile_y" value="23"/> + <property name="dest_x" value="84"/> + <property name="dest_y" value="23"/> </properties> </object> <object id="2" name="To Second Floor" type="warp" x="1888" y="672" width="64" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="26"/> </properties> </object> <object id="3" name="To Outside" type="warp" x="1280" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="047-1"/> - <property name="dest_tile_x" value="128"/> - <property name="dest_tile_y" value="40"/> + <property name="dest_x" value="128"/> + <property name="dest_y" value="40"/> </properties> </object> <object id="4" name="To Third Floor" type="warp" x="2656" y="672" width="64" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="22"/> - <property name="dest_tile_y" value="76"/> + <property name="dest_x" value="22"/> + <property name="dest_y" value="76"/> </properties> </object> <object id="5" name="To Office" type="warp" x="3616" y="736" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="147"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="147"/> + <property name="dest_y" value="35"/> </properties> </object> <object id="6" name="To First Floor" type="warp" x="3872" y="896" width="64" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="7" name="To Office" type="warp" x="3040" y="736" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="178"/> - <property name="dest_tile_y" value="35"/> + <property name="dest_x" value="178"/> + <property name="dest_y" value="35"/> </properties> </object> <object id="8" name="To Corridor" type="warp" x="4704" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="113"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="113"/> + <property name="dest_y" value="24"/> </properties> </object> <object id="9" name="To Corridor" type="warp" x="5696" y="1152" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="95"/> - <property name="dest_tile_y" value="24"/> + <property name="dest_x" value="95"/> + <property name="dest_y" value="24"/> </properties> </object> <object id="10" name="To Corridor" type="warp" x="864" y="4512" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="52"/> - <property name="dest_tile_y" value="102"/> + <property name="dest_x" value="52"/> + <property name="dest_y" value="102"/> </properties> </object> <object id="11" name="To Fourth Floor" type="warp" x="1888" y="2272" width="64" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="104"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="104"/> </properties> </object> <object id="12" name="To Library" type="warp" x="736" y="2336" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="85"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="85"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="13" name="To Library" type="warp" x="1760" y="2336" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="14" name="To Third Floor" type="warp" x="1920" y="3392" width="64" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="73"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="73"/> </properties> </object> <object id="15" name="To Bedroom" type="warp" x="1664" y="3232" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="27"/> - <property name="dest_tile_y" value="140"/> + <property name="dest_x" value="27"/> + <property name="dest_y" value="140"/> </properties> </object> <object id="16" name="To Corridor" type="warp" x="3872" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="55"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="55"/> + <property name="dest_y" value="74"/> </properties> </object> <object id="17" name="To Corridor" type="warp" x="2720" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="048-2"/> - <property name="dest_tile_x" value="23"/> - <property name="dest_tile_y" value="74"/> + <property name="dest_x" value="23"/> + <property name="dest_y" value="74"/> </properties> </object> <object id="18" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="1120" y="768" width="32" height="32"/> diff --git a/maps/051-1.tmx b/maps/051-1.tmx index d2fa6317..cf9c083e 100644 --- a/maps/051-1.tmx +++ b/maps/051-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="190" height="80" tilewidth="32" tileheight="32" nextobjectid="5"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="190" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="5"> <properties> <property name="minimap" value="graphics/minimaps/051-1.png"/> <property name="name" value="Illia outskirts"/> @@ -24,7 +24,7 @@ <tileset firstgid="1337" source="../tilesets/desert_city.tsx"/> <tileset firstgid="1593" source="../tilesets/water_overflow.tsx"/> <tileset firstgid="1665" source="../tilesets/docks.tsx"/> - <layer name="Ground1" width="190" height="80"> + <layer id="1" name="Ground1" width="190" height="80"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,1226,1238,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,1226,1238,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611, @@ -108,7 +108,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,1226,1227,1227,1227,1227,1227,1227,1227,1227,1227,1227,1238,611,611,758,759,759,759,759,759,760,758,759,759,759,759,759,759,760,758,759,759,759,759,760,758,759,759,759,760,758,759,759,759,759,759,759,759,759,760,758,759,759,759,759,760,758,759,759,759,759,759,759,760,758,759,759,759,759,760,758,759,759,760,758,759,759,759,760,758,759,759,759,759,759,759,759,759,759,760,758,759,759,759,760,758,759,759,759,759 </data> </layer> - <layer name="Ground2" width="190" height="80"> + <layer id="2" name="Ground2" width="190" 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,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -192,7 +192,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,714,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="190" height="80"> + <layer id="3" name="Ground3" width="190" 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,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -276,7 +276,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 </data> </layer> - <layer name="Ground4" width="190" height="80"> + <layer id="4" name="Ground4" width="190" 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,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -360,7 +360,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 </data> </layer> - <layer name="Ground5" width="190" height="80"> + <layer id="5" name="Ground5" width="190" 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,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -444,7 +444,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 </data> </layer> - <layer name="Fringe" width="190" height="80"> + <layer id="6" name="Fringe" width="190" 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,295,296,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,295,296,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,295,296,0,0,291,292,0,0,0,0,0,291,292,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -528,7 +528,7 @@ 0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,293,294,0,0,0,293,294,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,293,294,0,0,293,294,0,293,294,293,294,0,0,291,292,0,293,294,0,291,292,293,294,0,291,292,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="190" height="80"> + <layer id="7" name="Over1" width="190" 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,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -612,7 +612,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 </data> </layer> - <layer name="Collision" width="190" height="80"> + <layer id="8" name="Collision" width="190" height="80"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -696,21 +696,21 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="9" name="Objects" visible="0"> <object id="1" name="graphics/particles/waterfall-2x4.particle.xml" type="particle_effect" x="5435" y="803"/> <object id="2" name="graphics/particles/cursed-waterfall.particle.xml" type="particle_effect" x="5435" y="803"/> <object id="3" name="LogHead" type="spawn" x="672" y="736" width="1386" height="810"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="30"/> <property name="monster_id" value="23"/> </properties> </object> <object id="4" name="SpikyMushroom" type="spawn" x="704" y="768" width="1348" height="766"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="17"/> </properties> diff --git a/maps/051-3.tmx b/maps/051-3.tmx index 0e556a38..f6011242 100644 --- a/maps/051-3.tmx +++ b/maps/051-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="115" height="130" tilewidth="32" tileheight="32" nextobjectid="26"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="115" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="26"> <properties> <property name="minimap" value="graphics/minimaps/051-3.png"/> <property name="name" value="Illia Bandit Cave"/> @@ -10,144 +10,144 @@ <tileset firstgid="515" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="771" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="819" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="851" source="../tilesets/pots_x2.tsx"/> - <tileset firstgid="867" source="../tilesets/cave.tsx"/> - <tileset firstgid="995" source="../tilesets/cave_x2.tsx"/> - <layer name="Ground1" width="115" height="130"> + <tileset firstgid="867" source="../tilesets/pots_x2.tsx"/> + <tileset firstgid="883" source="../tilesets/cave.tsx"/> + <tileset firstgid="1011" source="../tilesets/cave_x2.tsx"/> + <layer id="1" name="Ground1" width="115" height="130"> <data encoding="csv"> -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,905,906,906,906,907,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,922,922,922,923,905,906,906,906,907,887,887,887,887,887,905,906,906,906,907,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,905,903,903,903,903,903,903,903,903,903,904,938,938,938,939,921,515,569,515,923,887,887,887,887,887,921,928,929,930,923,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,905,903,904,919,919,919,919,919,919,919,919,919,920,986,986,986,902,904,586,913,588,902,903,903,903,903,907,937,944,945,946,939,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,919,920,935,935,935,935,935,935,935,935,935,936,986,986,986,918,920,986,986,986,918,919,928,929,930,902,904,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,937,935,936,960,961,961,961,961,961,961,961,962,973,986,986,986,934,936,877,878,879,934,935,944,945,946,918,920,986,986,986,886,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,960,961,975,977,977,977,977,977,977,977,978,986,986,986,986,986,986,893,894,895,986,986,986,986,986,934,936,986,986,986,902,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,907,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,958,993,959,977,977,978,986,877,878,878,878,878,943,894,895,986,871,986,986,986,986,986,986,986,986,918,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,923,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,978,986,976,977,958,994,986,893,894,894,894,894,894,894,895,986,986,986,986,986,986,987,986,986,986,934,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,939,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,974,961,975,977,978,986,986,893,894,894,894,894,894,894,942,878,878,878,878,878,878,879,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,977,977,977,977,978,986,986,909,910,910,927,894,894,894,894,894,894,894,894,894,894,895,871,871,871,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,872,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,977,958,993,993,994,986,871,871,871,871,893,894,894,894,894,894,894,894,894,894,894,895,871,871,871,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,992,993,993,993,993,993,994,986,986,986,986,986,986,986,986,893,894,894,894,894,894,894,894,894,894,894,895,871,986,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,885,906,906,906,906,906,906,906,906,906,906,906, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,986,986,986,986,887,887,887,887,887,872,986,986,893,894,894,894,894,894,894,894,894,894,894,895,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,905,906,906,906,906,906,906,906,901,922,922,922,922,922,922,922,922,922,922,922, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,909,910,910,910,910,910,910,910,910,910,910,911,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,922,922,922,922,922,922,922,917,938,938,938,938,938,938,938,938,938,938,938, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,870,887,887,887,887,887,887,887,887,887,887,905,906,906,906,907,887,887,887,887,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,937,938,938,938,938,938,938,938,933,960,961,961,961,961,961,961,961,961,961,961, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,986,986,986,986,986,986,986,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,921,928,929,930,923,887,887,887,887,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,937,960,961,961,961,961,961,961,961,975,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,986,986,986,986,986,986,986,986,973,986,986,986,986,887,887,887,887,887,887,887,887,887,887,887,937,944,945,946,939,887,887,887,887,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,904,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,986,986,986,986,986,986,986,986,986,986,986,887,887,887,887,887,887,887,887,885,903,903,903,904,877,878,879,902,903,903,903,907,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,920,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,986,986,986,986,986,986,986,986,986,887,887,887,887,887,887,887,887,905,901,919,919,919,920,893,894,895,918,919,919,919,923,887,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,906,906,906,906,906,906,906,904,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,986,986,986,986,986,986,986,887,887,887,887,887,887,887,887,887,921,917,935,935,935,936,909,910,911,934,935,935,935,939,563,887,887,888,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,921,922,922,922,922,922,922,922,920,960,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,872,986,986,986,870,887,887,887,887,887,887,887,887,887,887,937,933,986,986,986,986,986,986,986,986,986,986,986,902,906,903,903,904,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,937,938,938,938,938,938,938,938,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,905,906,906,906,906,906,906,906,907,887,887,887,887,887,888,986,871,871,886,887,887,887,887,887,887,887,887,887,887,937,986,986,877,878,878,878,878,878,878,878,879,986,918,922,919,919,920,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,937,960,961,961,961,961,961,961,961,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,922,953,954,955,922,922,922,923,887,887,887,887,887,888,871,871,871,886,887,887,887,887,887,887,887,887,887,887,937,986,986,893,894,894,894,894,894,894,894,895,986,934,938,935,935,936,986,886,887,887,887,887,887,887,887,887,887,887,887,887,905,904,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,937,938,969,970,971,938,938,938,939,887,887,887,887,887,888,871,871,871,886,887,887,887,887,887,887,887,887,887,887,887,887,872,893,894,894,894,894,894,894,894,895,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,921,920,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,905,906,904,986,986,986,986,986,986,986,902,903,903,907,887,887,888,871,871,986,886,887,887,887,887,887,887,887,887,887,887,887,885,904,893,894,894,894,894,894,894,894,895,986,986,871,871,871,871,871,886,887,887,887,887,887,887,887,887,887,887,906,906,904,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,922,920,986,986,986,986,986,986,986,918,919,919,923,887,887,888,871,871,871,886,887,887,887,887,887,887,887,887,887,905,903,901,920,909,910,910,910,910,910,910,910,911,986,870,887,887,887,887,887,887,887,887,887,887,887,887,887,563,563,921,922,922,920,960,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,937,938,936,986,986,986,986,986,986,986,934,935,935,902,906,907,888,871,871,871,886,887,887,887,887,887,887,887,887,887,921,922,917,936,986,986,986,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,563,563,937,938,938,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,986,986,986,986,986,986,986,986,986,918,919,923,888,871,871,871,886,887,887,887,887,887,887,887,887,887,937,938,933,986,986,986,986,986,986,986,986,986,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,563,563,937,960,961,961,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,973,986,986,986,960,961,962,986,986,986,934,935,902,904,871,871,990,886,887,887,887,887,887,887,887,887,887,937,986,986,986,986,887,887,887,872,986,545,871,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,563,563,937,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,986,986,960,975,977,974,962,986,986,986,986,918,920,973,973,871,886,887,887,887,887,887,887,887,887,887,937,986,986,887,887,887,887,887,888,871,545,871,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,563,563,937,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,986,986,976,977,958,959,974,962,986,986,986,934,936,871,986,990,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,545,871,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,563,563,937,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,986,986,992,993,994,992,959,974,962,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,545,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,563,563,937,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,993,993,993,993,993,993,993, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,990,986,973,986,986,973,992,959,974,962,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,545,871,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,563,905,904,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,993,993,993,993,993,994,986,986,986,986,986,986,986, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,986,877,878,878,878,879,986,992,959,974,962,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,545,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,563,921,920,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,994,986,986,986,986,986,986,986,986,986,986,986,986,986, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,872,986,986,986,893,894,894,894,895,990,986,992,959,974,962,986,986,960,962,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,545,871,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,563,937,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,994,986,986,986,986,986,986,986,986,986,986,870,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,973,909,910,910,910,911,986,990,986,992,959,974,961,961,975,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,545,871,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,905,904,960,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,994,986,986,986,986,986,986,986,986,986,986,986,886,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,986,986,986,986,561,986,986,986,871,992,959,977,977,958,994,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,561,871,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,920,976,977,977,977,977,977,977,977,977,977,958,993,993,993,993,993,994,986,986,986,986,986,986,870,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,886,887,887,887,887,887,561,887,887,887,986,986,976,977,977,978,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,545,986,886,887,887,887,887,887,887,887,887,887,887,887,905,906,906,906,904,936,976,977,977,977,977,977,977,977,977,958,994,986,986,986,986,986,986,986,986,986,986,870,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,886,887,887,887,887,887,561,887,887,887,887,872,976,977,977,978,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,561,871,886,887,887,887,887,887,887,887,887,887,887,887,921,922,922,922,920,960,975,977,977,977,977,977,977,977,958,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,986,887,887,887,887,887,887,561,887,887,887,887,872,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,561,986,886,887,887,887,887,887,887,887,887,887,887,887,937,938,938,938,936,976,977,977,977,977,977,977,977,958,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,561,887,887,887,887,872,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,561,871,886,887,887,887,887,887,887,887,887,887,887,887,888,960,961,961,961,975,977,977,977,977,977,977,958,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,561,887,887,887,887,872,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,561,871,886,887,887,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,977,977,977,977,977,958,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,561,887,887,887,887,872,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,561,871,886,887,887,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,977,977,977,977,958,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,561,887,887,887,887,888,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,561,986,886,887,887,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,977,977,977,958,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,561,887,887,887,887,888,976,977,977,978,902,907,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,871,561,871,902,903,907,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,977,977,958,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,885,906,906,561,906,907,887,887,888,976,977,977,978,918,923,887,887,887,887,887,887,887,887,887,885,903,903,903,903,903,903,903,904,986,986,986,918,919,923,887,887,887,887,887,887,887,887,887,888,976,977,977,977,977,977,977,978,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,922,986,561,986,923,887,887,888,976,977,977,978,934,939,887,887,887,905,906,906,906,884,885,901,919,919,919,919,919,919,919,920,986,986,986,934,935,886,563,887,887,887,887,887,887,887,887,888,976,977,977,977,977,977,977,978,939,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,885,905,906,904,938,986,561,986,939,887,887,888,976,977,977,974,962,886,887,887,887,921,922,922,922,900,901,917,935,935,935,935,935,935,935,936,986,986,986,986,986,902,906,906,906,906,906,906,906,906,906,904,976,977,977,977,977,977,958,994,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,905,906,901,922,922,920,986,986,986,986,886,887,887,888,976,977,977,958,994,886,887,887,887,937,938,938,938,916,917,933,986,986,986,986,986,986,986,986,986,986,986,986,986,918,922,922,922,922,922,922,922,922,922,920,976,977,977,977,977,958,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,921,922,917,938,938,936,986,986,986,986,886,887,887,888,976,977,977,978,870,887,887,887,887,937,877,878,879,932,933,986,986,986,986,986,986,986,986,986,986,986,986,986,986,934,938,938,938,938,938,938,938,938,938,936,976,977,977,958,993,994,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,937,938,933,986,986,986,986,986,986,986,886,887,887,888,976,977,977,978,886,887,887,887,887,937,893,894,895,986,986,986,986,740,740,740,740,740,740,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,976,977,977,978,870,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,937,986,986,986,986,986,986,986,986,986,886,887,887,888,976,977,977,978,886,887,887,887,887,937,909,910,911,986,986,986,986,740,740,740,740,740,740,986,986,986,986,986,870,887,887,887,887,887,887,887,887,872,986,986,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,888,986,986,986,986,986,986,870,887,887,887,887,887,888,992,959,977,978,886,887,887,887,887,937,986,986,870,887,887,986,986,986,986,986,986,986,986,986,986,986,986,870,887,887,887,887,887,887,887,887,887,887,887,872,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,986,563,563,563,563,563,563,563,872,976,977,978,886,563,563,563,563,563,563,563,563,563,563,563,563,563,872,986,986,986,870,563,563,563,563,563,563,563,563,887,887,887,887,887,887,887,887,888,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,986,563,563,563,563,563,563,563,888,976,977,978,886,563,563,563,563,563,563,563,563,563,563,563,563,563,563,872,986,986,886,563,563,563,563,563,563,563,563,887,887,887,887,887,887,887,887,888,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,986,986,986,563,563,563,563,563,888,976,977,978,886,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,887,887,887,887,887,887,887,888,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,986,563,563,563,563,563,888,976,977,978,886,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,887,887,887,887,887,887,887,888,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,986,563,563,563,563,563,888,976,977,978,886,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,563,563,563,563,563,563,563,887,887,887,887,887,887,887,887,888,976,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,905,906,906,906,906,906,906,906,906,906,986,906,906,906,906,906,904,976,977,978,902,906,906,906,906,906,906,907,887,887,887,887,887,887,905,906,906,884,887,887,887,887,887,887,885,906,906,906,906,906,906,906,906,906,906,904,976,977,977,978,902,906,906,884,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,921,922,880,881,882,922,922,922,922,986,561,986,922,922,922,922,920,976,977,978,918,922,922,922,922,922,922,923,887,887,887,887,887,887,921,922,922,900,906,906,906,906,906,906,901,922,922,922,922,922,922,922,922,922,922,920,976,977,977,978,918,922,922,900,906,884,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,938,896,897,898,938,938,938,938,986,561,986,938,938,938,938,936,976,977,978,934,938,938,938,938,938,938,902,906,906,906,906,906,906,904,938,938,916,922,922,922,922,922,922,917,938,938,938,938,938,938,938,938,938,938,936,976,977,977,978,934,938,938,916,922,900,906,884,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,912,913,914,986,986,986,986,986,986,986,986,986,986,986,986,976,977,974,961,961,961,961,961,961,962,918,922,922,922,922,922,922,920,960,962,932,938,938,938,938,938,938,933,960,961,961,961,961,961,961,961,961,961,961,975,977,977,974,961,961,962,932,938,916,922,923,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,960,961,962,986,986,960,961,961,961,961,962,986,986,986,960,975,977,977,977,977,977,977,977,977,978,934,938,938,938,938,938,938,936,976,974,961,961,961,961,961,961,961,961,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,961,962,932,938,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,976,977,974,961,962,976,977,977,977,977,974,961,961,961,975,977,977,977,977,977,977,977,977,977,974,961,961,961,961,961,961,961,961,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,993,959,977,977,977,977,977,977,977,977,974,961,962,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,976,977,977,977,978,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,993,993,993,993,993,993,993,959,977,978,986,976,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,976,977,977,958,994,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,994,986,986,986,986,986,986,986,976,977,974,961,975,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,992,993,993,994,986,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,870,563,563,563,563,563,563,872,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,986,986,960,961,961,975,977,977,977,977,977,977,977,977,958,993,959,977,977,977,977,977,977,977,977,978,870,563,905,906,906,906,906,906,906,907,563,563,563,563,563,563,563,563,563,563,563,563,888,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,986,986,976,977,958,993,993,993,993,993,993,993,993,993,563,872,976,977,977,977,977,977,977,977,977,978,886,563,921,922,922,922,922,922,922,923,563,563,905,906,906,906,907,887,563,563,563,563,888,992,959,977,977,977,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,986,986,976,977,978,870,986,986,986,986,986,986,905,906,903,904,976,977,977,977,977,977,977,977,977,978,886,563,937,938,938,938,938,938,938,902,884,563,921,922,922,922,923,905,906,884,563,563,563,872,992,959,977,977,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,986,986,986,976,977,978,886,986,986,986,986,986,986,921,922,919,920,976,977,977,977,977,977,977,977,977,978,886,563,937,986,986,986,986,986,986,918,923,563,937,938,938,938,939,921,922,900,906,906,907,888,986,976,977,977,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,960,961,961,975,977,978,886,986,986,986,986,986,986,937,938,935,936,976,977,977,977,977,977,977,977,977,978,886,563,937,986,877,878,878,878,879,934,939,563,888,986,986,986,902,904,938,916,922,922,923,563,872,976,977,977,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,976,977,977,977,977,978,886,986,986,986,986,986,986,888,960,961,961,975,977,977,977,977,977,977,977,977,978,886,563,937,986,893,894,894,894,895,986,902,903,904,986,986,986,918,920,986,932,938,938,939,563,888,992,959,977,977,977,977,977,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,976,977,977,977,977,978,886,986,986,986,986,986,986,888,976,977,977,977,977,977,977,977,977,977,977,977,978,902,563,937,986,893,894,894,894,895,986,918,919,920,986,986,986,934,936,986,986,986,986,886,563,563,872,992,993,993,993,993,959,977,977,977,977,977,977,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,976,977,977,977,977,978,902,906,906,906,906,906,906,904,976,977,977,977,977,977,977,977,977,977,977,977,978,918,923,563,872,909,910,910,910,911,986,934,935,936,986,986,986,986,986,986,986,986,986,886,563,563,888,986,986,986,986,986,992,993,993,993,993,993,993,978,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,976,977,977,977,977,978,918,922,922,922,922,922,922,920,976,977,977,977,977,977,977,977,977,977,977,977,978,934,939,563,563,872,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,886,887,887,888,986,986,986,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,905,906,903,904,976,977,977,977,977,978,934,938,938,938,938,938,938,936,976,977,977,977,977,977,977,977,977,977,977,977,974,962,902,884,563,563,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,870,563,887,887,888,986,986,985,986,877,878,878,878,879,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,887,563,563,563,887,921,922,919,920,976,977,977,977,977,974,961,961,961,961,961,961,961,961,975,977,977,977,977,977,977,977,977,977,977,977,977,978,918,923,563,563,888,515,515,515,596,563,515,515,596,563,596,515,515,563,986,986,886,563,887,887,888,986,986,986,986,893,894,894,894,895,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,887,905,906,906,884,887,885,906,906,904,938,935,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,939,563,563,888,531,531,531,548,563,531,531,548,563,548,531,531,563,986,986,902,906,906,906,904,986,986,986,986,893,894,894,894,895,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,887,921,922,922,900,906,901,922,922,920,960,961,961,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,962,902,884,563,888,547,547,547,548,563,547,547,548,563,548,547,547,563,986,986,918,922,922,922,920,986,986,986,986,909,910,910,910,911,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -903,903,903,903,903,903,903,903,903,906,904,938,938,916,922,917,938,938,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,918,923,563,937,548,548,548,548,563,548,548,548,563,548,548,548,563,986,986,934,938,938,938,936,986,986,986,986,986,986,986,986,986,986,902,906,906,906,907,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -919,919,919,919,919,919,919,919,919,922,920,960,962,932,938,933,960,961,961,975,977,977,977,977,977,977,977,977,958,993,993,993,959,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,939,563,563,563,872,548,548,563,548,548,548,563,548,548,548,563,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,918,928,929,930,923,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -935,935,935,935,935,935,935,935,935,938,936,976,974,961,961,961,975,977,977,977,977,977,977,958,993,993,993,993,994,987,986,986,992,993,959,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,962,902,884,563,563,888,548,548,563,548,548,548,563,548,548,548,563,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,985,934,944,945,946,939,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -961,961,961,961,961,961,961,961,961,961,961,975,977,977,977,977,977,977,977,977,977,977,977,978,986,986,986,986,986,986,986,986,987,986,992,959,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,918,923,563,563,563,563,563,563,563,563,563,563,563,563,563,563,872,986,986,986,986,986,986,986,986,986,986,986,987,986,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,958,993,994,986,986,986,986,986,986,986,986,986,986,986,992,959,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,939,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,596,515,515,515,515,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,871,986,986,986,985,986,986,986,986,986,986,986,986,986,992,993,993,959,977,977,977,977,977,977,977,977,977,977,977,974,962,939,563,887,887,885,906,906,906,906,906,906,906,906,906,906,904,548,531,531,531,531,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,871,871,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,976,977,977,977,977,977,977,977,977,977,977,977,977,978,902,903,906,906,901,922,922,922,922,922,922,922,922,922,922,920,548,547,547,547,547,886,887,887,887,986,986,986,986,986,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,871,871,871,986,986,986,986,986,986,986,986,986,986,986,986,986,960,975,977,977,977,977,977,977,977,977,977,977,977,977,978,918,919,922,922,917,938,938,938,938,938,938,938,938,938,938,936,548,548,548,548,548,886,887,887,887,887,986,986,986,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,887,887,887,563,563,563,563,563,563,563,563,563,563,563,563,872,976,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,935,938,938,933,960,961,962,986,870,563,563,563,563,563,872,548,548,548,550,551,886,887,887,887,887,986,986,986,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,887,887,887,563,563,563,563,563,563,563,563,563,563,563,563,888,976,977,977,977,977,977,977,977,977,977,977,977,977,977,974,961,961,961,961,961,975,977,978,986,902,884,563,563,563,563,888,548,548,548,566,567,886,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,887,887,887,887,563,563,563,563,563,563,563,563,563,563,905,904,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,986,918,923,563,563,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,921,920,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,962,934,939,563,563,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,962,886,563,563,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,960,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,902,884,563,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,918,923,563,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,939,563,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,962,902,884,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,918,923,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,905,904,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,939,563,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,921,920,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,962,902,884,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,918,923,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,905,904,960,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,939,563,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,921,920,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,962,902,884,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,936,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,918,923,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,960,975,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,939,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,888,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,974,962,902,884,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,888,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,918,923,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887, -563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,887,888,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,934,939,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887,887 +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,921,922,922,922,923,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,938,938,938,939,921,922,922,922,923,903,903,903,903,903,921,922,922,922,923,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,921,919,919,919,919,919,919,919,919,919,920,954,954,954,955,937,515,569,515,939,903,903,903,903,903,937,944,945,946,939,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,921,919,920,935,935,935,935,935,935,935,935,935,936,1002,1002,1002,918,920,586,929,588,918,919,919,919,919,923,953,960,961,962,955,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,935,936,951,951,951,951,951,951,951,951,951,952,1002,1002,1002,934,936,1002,1002,1002,934,935,944,945,946,918,920,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,953,951,952,976,977,977,977,977,977,977,977,978,989,1002,1002,1002,950,952,893,894,895,950,951,960,961,962,934,936,1002,1002,1002,902,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,976,977,991,993,993,993,993,993,993,993,994,1002,1002,1002,1002,1002,1002,909,910,911,1002,1002,1002,1002,1002,950,952,1002,1002,1002,918,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,922,923,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,974,1009,975,993,993,994,1002,893,894,894,894,894,959,910,911,1002,887,1002,1002,1002,1002,1002,1002,1002,1002,934,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,939,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,994,1002,992,993,974,1010,1002,909,910,910,910,910,910,910,911,1002,1002,1002,1002,1002,1002,1003,1002,1002,1002,950,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,955,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,990,977,991,993,994,1002,1002,909,910,910,910,910,910,910,958,894,894,894,894,894,894,895,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,993,993,993,993,994,1002,1002,925,926,926,943,910,910,910,910,910,910,910,910,910,910,911,887,887,887,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,888,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,993,974,1009,1009,1010,1002,887,887,887,887,909,910,910,910,910,910,910,910,910,910,910,911,887,887,887,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1008,1009,1009,1009,1009,1009,1010,1002,1002,1002,1002,1002,1002,1002,1002,909,910,910,910,910,910,910,910,910,910,910,911,887,1002,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,901,922,922,922,922,922,922,922,922,922,922,922, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1002,1002,1002,1002,903,903,903,903,903,888,1002,1002,909,910,910,910,910,910,910,910,910,910,910,911,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,921,922,922,922,922,922,922,922,917,938,938,938,938,938,938,938,938,938,938,938, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,925,926,926,926,926,926,926,926,926,926,926,927,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,938,938,938,938,938,938,938,933,954,954,954,954,954,954,954,954,954,954,954, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,886,903,903,903,903,903,903,903,903,903,903,921,922,922,922,923,903,903,903,903,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,953,954,954,954,954,954,954,954,949,976,977,977,977,977,977,977,977,977,977,977, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,937,944,945,946,939,903,903,903,903,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,953,976,977,977,977,977,977,977,977,991,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,1002,1002,1002,1002,1002,1002,1002,1002,989,1002,1002,1002,1002,903,903,903,903,903,903,903,903,903,903,903,953,960,961,962,955,903,903,903,903,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,920,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,903,903,903,903,903,903,903,903,901,919,919,919,920,893,894,895,918,919,919,919,923,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,936,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,1002,1002,1002,1002,1002,1002,1002,1002,1002,903,903,903,903,903,903,903,903,921,917,935,935,935,936,909,910,911,934,935,935,935,939,903,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,922,922,922,922,922,922,922,920,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,1002,1002,1002,1002,1002,1002,1002,903,903,903,903,903,903,903,903,903,937,933,951,951,951,952,925,926,927,950,951,951,951,955,563,903,903,904,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,937,938,938,938,938,938,938,938,936,976,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,888,1002,1002,1002,886,903,903,903,903,903,903,903,903,903,903,953,949,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,918,922,919,919,920,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,953,954,954,954,954,954,954,954,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,921,922,922,922,922,922,922,922,923,903,903,903,903,903,904,1002,887,887,902,903,903,903,903,903,903,903,903,903,903,953,1002,1002,893,894,894,894,894,894,894,894,895,1002,934,938,935,935,936,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,953,976,977,977,977,977,977,977,977,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,938,969,970,971,938,938,938,939,903,903,903,903,903,904,887,887,887,902,903,903,903,903,903,903,903,903,903,903,953,1002,1002,909,910,910,910,910,910,910,910,911,1002,950,954,951,951,952,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,921,920,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,953,954,985,986,987,954,954,954,955,903,903,903,903,903,904,887,887,887,902,903,903,903,903,903,903,903,903,903,903,903,903,888,909,910,910,910,910,910,910,910,911,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,937,936,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,921,922,920,1002,1002,1002,1002,1002,1002,1002,918,919,919,923,903,903,904,887,887,1002,902,903,903,903,903,903,903,903,903,903,903,903,901,920,909,910,910,910,910,910,910,910,911,1002,1002,887,887,887,887,887,902,903,903,903,903,903,903,903,903,903,903,922,922,920,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,938,936,1002,1002,1002,1002,1002,1002,1002,934,935,935,939,903,903,904,887,887,887,902,903,903,903,903,903,903,903,903,903,921,919,917,936,925,926,926,926,926,926,926,926,927,1002,886,903,903,903,903,903,903,903,903,903,903,903,903,903,563,563,937,938,938,936,976,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,953,954,952,1002,1002,1002,1002,1002,1002,1002,950,951,951,918,922,923,904,887,887,887,902,903,903,903,903,903,903,903,903,903,937,938,933,952,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,563,563,953,954,954,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,934,935,939,904,887,887,887,902,903,903,903,903,903,903,903,903,903,953,954,949,1002,1002,1002,1002,1002,1002,1002,1002,1002,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,563,563,953,976,977,977,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,989,1002,1002,1002,976,977,978,1002,1002,1002,950,951,918,920,887,887,1006,902,903,903,903,903,903,903,903,903,903,953,1002,1002,1002,1002,903,903,903,888,1002,545,887,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,563,563,953,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1002,1002,976,991,993,990,978,1002,1002,1002,1002,934,936,989,989,887,902,903,903,903,903,903,903,903,903,903,953,1002,1002,903,903,903,903,903,904,887,545,887,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,563,563,953,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1002,1002,992,993,974,975,990,978,1002,1002,1002,950,952,887,1002,1006,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,545,887,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,563,563,953,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1002,1002,1008,1009,1010,1008,975,990,978,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,545,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,563,563,953,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1009,1009,1009,1009,1009,1009,1009, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1006,1002,989,1002,1002,989,1008,975,990,978,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,545,887,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,563,921,920,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1009,1009,1009,1009,1009,1010,1002,1002,1002,1002,1002,1002,1002, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1002,893,894,894,894,895,1002,1008,975,990,978,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,545,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,563,937,936,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1010,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,888,1002,1002,1002,909,910,910,910,911,1006,1002,1008,975,990,978,1002,1002,976,978,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,545,887,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,563,953,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1010,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,886,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,989,925,926,926,926,927,1002,1006,1002,1008,975,990,977,977,991,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,545,887,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,921,920,976,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1010,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1002,1002,1002,1002,561,1002,1002,1002,887,1008,975,993,993,974,1010,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,561,887,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,936,992,993,993,993,993,993,993,993,993,993,974,1009,1009,1009,1009,1009,1010,1002,1002,1002,1002,1002,1002,886,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,902,903,903,903,903,903,561,903,903,903,1002,1002,992,993,993,994,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,545,1002,902,903,903,903,903,903,903,903,903,903,903,903,921,922,922,922,920,952,992,993,993,993,993,993,993,993,993,974,1010,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,886,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,902,903,903,903,903,903,561,903,903,903,903,888,992,993,993,994,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,561,887,902,903,903,903,903,903,903,903,903,903,903,903,937,938,938,938,936,976,991,993,993,993,993,993,993,993,974,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,1002,903,903,903,903,903,903,561,903,903,903,903,888,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,561,1002,902,903,903,903,903,903,903,903,903,903,903,903,953,954,954,954,952,992,993,993,993,993,993,993,993,974,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,561,903,903,903,903,888,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,561,887,902,903,903,903,903,903,903,903,903,903,903,903,904,976,977,977,977,991,993,993,993,993,993,993,974,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,561,903,903,903,903,888,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,561,887,902,903,903,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,993,993,993,993,993,974,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,561,903,903,903,903,888,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,561,887,902,903,903,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,993,993,993,993,974,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,561,903,903,903,903,904,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,561,1002,902,903,903,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,993,993,993,974,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,561,903,903,903,903,904,992,993,993,994,918,923,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,887,561,887,918,919,923,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,993,993,974,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,901,922,922,561,922,923,903,903,904,992,993,993,994,934,939,903,903,903,903,903,903,903,903,903,901,919,919,919,919,919,919,919,920,1002,1002,1002,934,935,939,903,903,903,903,903,903,903,903,903,904,992,993,993,993,993,993,993,994,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,938,1002,561,1002,939,903,903,904,992,993,993,994,950,955,903,903,903,921,922,922,922,900,901,917,935,935,935,935,935,935,935,936,1002,1002,1002,950,951,902,563,903,903,903,903,903,903,903,903,904,992,993,993,993,993,993,993,994,955,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,901,921,922,920,954,1002,561,1002,955,903,903,904,992,993,993,990,978,902,903,903,903,937,938,938,938,916,917,933,951,951,951,951,951,951,951,952,1002,1002,1002,1002,1002,918,922,922,922,922,922,922,922,922,922,920,992,993,993,993,993,993,974,1010,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,921,922,917,938,938,936,1002,1002,1002,1002,902,903,903,904,992,993,993,974,1010,902,903,903,903,953,954,954,954,932,933,949,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,934,938,938,938,938,938,938,938,938,938,936,992,993,993,993,993,974,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,937,938,933,954,954,952,1002,1002,1002,1002,902,903,903,904,992,993,993,994,886,903,903,903,903,953,893,894,895,948,949,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,950,954,954,954,954,954,954,954,954,954,952,992,993,993,974,1009,1010,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,953,954,949,1002,1002,1002,1002,1002,1002,1002,902,903,903,904,992,993,993,994,902,903,903,903,903,953,909,910,911,1002,1002,1002,1002,740,740,740,740,740,740,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,992,993,993,994,886,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,953,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,904,992,993,993,994,902,903,903,903,903,953,925,926,927,1002,1002,1002,1002,740,740,740,740,740,740,1002,1002,1002,1002,1002,886,903,903,903,903,903,903,903,903,888,1002,1002,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,904,1002,1002,1002,1002,1002,1002,886,903,903,903,903,903,904,1008,975,993,994,902,903,903,903,903,953,1002,1002,886,903,903,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,886,903,903,903,903,903,903,903,903,903,903,903,888,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1002,563,563,563,563,563,563,563,888,992,993,994,902,563,563,563,563,563,563,563,563,563,563,563,563,563,888,1002,1002,1002,886,563,563,563,563,563,563,563,563,903,903,903,903,903,903,903,903,904,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1002,563,563,563,563,563,563,563,904,992,993,994,902,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,1002,1002,902,563,563,563,563,563,563,563,563,903,903,903,903,903,903,903,903,904,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1002,1002,1002,563,563,563,563,563,904,992,993,994,902,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,903,903,903,903,903,903,903,904,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1002,563,563,563,563,563,904,992,993,994,902,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,903,903,903,903,903,903,903,904,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,1002,563,563,563,563,563,904,992,993,994,902,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,563,563,563,563,563,563,563,903,903,903,903,903,903,903,903,904,992,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,921,922,922,922,922,922,922,922,922,922,1002,922,922,922,922,922,920,992,993,994,918,922,922,922,922,922,922,923,903,903,903,903,903,903,921,922,922,900,903,903,903,903,903,903,901,922,922,922,922,922,922,922,922,922,922,920,992,993,993,994,918,922,922,900,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,938,896,897,898,938,938,938,938,1002,561,1002,938,938,938,938,936,992,993,994,934,938,938,938,938,938,938,939,903,903,903,903,903,903,937,938,938,916,922,922,922,922,922,922,917,938,938,938,938,938,938,938,938,938,938,936,992,993,993,994,934,938,938,916,922,900,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,954,912,913,914,954,954,954,954,1002,561,1002,954,954,954,954,952,992,993,994,950,954,954,954,954,954,954,918,922,922,922,922,922,922,920,954,954,932,938,938,938,938,938,938,933,954,954,954,954,954,954,954,954,954,954,952,992,993,993,994,950,954,954,932,938,916,922,900,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,928,929,930,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,992,993,990,977,977,977,977,977,977,978,934,938,938,938,938,938,938,936,976,978,948,954,954,954,954,954,954,949,976,977,977,977,977,977,977,977,977,977,977,991,993,993,990,977,977,978,948,954,932,938,939,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,976,977,978,1002,1002,976,977,977,977,977,978,1002,1002,1002,976,991,993,993,993,993,993,993,993,993,994,950,954,954,954,954,954,954,952,992,990,977,977,977,977,977,977,977,977,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,977,978,948,954,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,992,993,990,977,978,992,993,993,993,993,990,977,977,977,991,993,993,993,993,993,993,993,993,993,990,977,977,977,977,977,977,977,977,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1009,975,993,993,993,993,993,993,993,993,990,977,978,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,992,993,993,993,994,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1009,1009,1009,1009,1009,1009,1009,975,993,994,1002,992,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,992,993,993,974,1010,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1010,1002,1002,1002,1002,1002,1002,1002,992,993,990,977,991,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,1008,1009,1009,1010,1002,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1010,886,563,563,563,563,563,563,888,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,1002,1002,976,977,977,991,993,993,993,993,993,993,993,993,974,1009,975,993,993,993,993,993,993,993,993,994,886,563,921,922,922,922,922,922,922,923,563,563,563,563,563,563,563,563,563,563,563,563,904,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,1002,1002,992,993,974,1009,1009,1009,1009,1009,1009,1009,1009,1009,563,888,992,993,993,993,993,993,993,993,993,994,902,563,937,938,938,938,938,938,938,939,563,563,921,922,922,922,923,903,563,563,563,563,904,1008,975,993,993,993,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,1002,1002,992,993,994,886,1002,1002,1002,1002,1002,1002,921,922,919,920,992,993,993,993,993,993,993,993,993,994,902,563,953,954,954,954,954,954,954,918,900,563,937,938,938,938,939,921,922,900,563,563,563,888,1008,975,993,993,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,1002,1002,1002,992,993,994,902,1002,1002,1002,1002,1002,1002,937,938,935,936,992,993,993,993,993,993,993,993,993,994,902,563,953,1002,1002,1002,1002,1002,1002,934,939,563,953,954,954,954,955,937,938,916,922,922,923,904,1002,992,993,993,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,976,977,977,991,993,994,902,1002,1002,1002,1002,1002,1002,953,954,951,952,992,993,993,993,993,993,993,993,993,994,902,563,953,1002,893,894,894,894,895,950,955,563,904,1002,1002,1002,918,920,954,932,938,938,939,563,888,992,993,993,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,992,993,993,993,993,994,902,1002,1002,1002,1002,1002,1002,904,976,977,977,991,993,993,993,993,993,993,993,993,994,902,563,953,1002,909,910,910,910,911,1002,918,919,920,1002,1002,1002,934,936,1002,948,954,954,955,563,904,1008,975,993,993,993,993,993,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,992,993,993,993,993,994,902,1002,1002,1002,1002,1002,1002,904,992,993,993,993,993,993,993,993,993,993,993,993,994,918,563,953,1002,909,910,910,910,911,1002,934,935,936,1002,1002,1002,950,952,1002,1002,1002,1002,902,563,563,888,1008,1009,1009,1009,1009,975,993,993,993,993,993,993,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,992,993,993,993,993,994,918,922,922,922,922,922,922,920,992,993,993,993,993,993,993,993,993,993,993,993,994,934,939,563,888,925,926,926,926,927,1002,950,951,952,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,563,563,904,1002,1002,1002,1002,1002,1008,1009,1009,1009,1009,1009,1009,994,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,992,993,993,993,993,994,934,938,938,938,938,938,938,936,992,993,993,993,993,993,993,993,993,993,993,993,994,950,955,563,563,888,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,904,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,921,922,919,920,992,993,993,993,993,994,950,954,954,954,954,954,954,952,992,993,993,993,993,993,993,993,993,993,993,993,990,978,918,900,563,563,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,886,563,903,903,904,1002,1002,1001,1002,893,894,894,894,895,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,903,563,563,563,903,937,938,935,936,992,993,993,993,993,990,977,977,977,977,977,977,977,977,991,993,993,993,993,993,993,993,993,993,993,993,993,994,934,939,563,563,904,515,515,515,596,563,515,515,596,563,596,515,515,563,1002,1002,902,563,903,903,904,1002,1002,1002,1002,909,910,910,910,911,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,903,921,922,922,900,903,901,922,922,920,954,951,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,955,563,563,904,531,531,531,548,563,531,531,548,563,548,531,531,563,1002,1002,918,922,922,922,920,1002,1002,1002,1002,909,910,910,910,911,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,903,937,938,938,916,922,917,938,938,936,976,977,977,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,978,918,900,563,904,547,547,547,548,563,547,547,548,563,548,547,547,563,1002,1002,934,938,938,938,936,1002,1002,1002,1002,925,926,926,926,927,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +919,919,919,919,919,919,919,919,919,922,920,954,954,932,938,933,954,954,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,934,939,563,953,548,548,548,548,563,548,548,548,563,548,548,548,563,1002,1002,950,954,954,954,952,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,918,922,922,922,923,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +935,935,935,935,935,935,935,935,935,938,936,976,978,948,954,949,976,977,977,991,993,993,993,993,993,993,993,993,974,1009,1009,1009,975,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,955,563,563,563,888,548,548,563,548,548,548,563,548,548,548,563,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,934,944,945,946,939,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +951,951,951,951,951,951,951,951,951,954,952,992,990,977,977,977,991,993,993,993,993,993,993,974,1009,1009,1009,1009,1010,1003,1002,1002,1008,1009,975,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,978,918,900,563,563,904,548,548,563,548,548,548,563,548,548,548,563,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1001,950,960,961,962,955,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +977,977,977,977,977,977,977,977,977,977,977,991,993,993,993,993,993,993,993,993,993,993,993,994,1002,1002,1002,1002,1002,1002,1002,1002,1003,1002,1008,975,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,934,939,563,563,563,563,563,563,563,563,563,563,563,563,563,563,888,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1003,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,974,1009,1010,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1008,975,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,955,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,596,515,515,515,515,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1010,887,1002,1002,1002,1001,1002,1002,1002,1002,1002,1002,1002,1002,1002,1008,1009,1009,975,993,993,993,993,993,993,993,993,993,993,993,990,978,955,563,903,903,901,922,922,922,922,922,922,922,922,922,922,920,548,531,531,531,531,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,887,887,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,992,993,993,993,993,993,993,993,993,993,993,993,993,994,918,919,922,922,917,938,938,938,938,938,938,938,938,938,938,936,548,547,547,547,547,902,903,903,903,1002,1002,1002,1002,1002,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,904,887,887,887,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,976,991,993,993,993,993,993,993,993,993,993,993,993,993,994,934,935,938,938,933,954,954,954,954,954,954,954,954,954,954,952,548,548,548,548,548,902,903,903,903,903,1002,1002,1002,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,903,903,903,563,563,563,563,563,563,563,563,563,563,563,563,888,992,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,951,954,954,949,976,977,978,1002,886,563,563,563,563,563,888,548,548,548,550,551,902,903,903,903,903,1002,1002,1002,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,903,903,903,563,563,563,563,563,563,563,563,563,563,563,563,904,992,993,993,993,993,993,993,993,993,993,993,993,993,993,990,977,977,977,977,977,991,993,994,1002,918,900,563,563,563,563,904,548,548,548,566,567,902,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,903,903,903,903,563,563,563,563,563,563,563,563,563,563,921,920,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,1002,934,939,563,563,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,936,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,978,950,955,563,563,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,978,902,563,563,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,976,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,918,900,563,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,934,939,563,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,955,563,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,978,918,900,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,934,939,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,921,920,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,955,563,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,936,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,978,918,900,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,934,939,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,921,920,976,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,955,563,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,937,936,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,978,918,900,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,952,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,934,939,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,953,976,991,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,955,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,904,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,990,978,918,900,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,904,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,934,939,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903, +563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,903,904,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,950,955,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903 </data> </layer> - <layer name="Ground2" width="115" height="130"> + <layer id="2" name="Ground2" width="115" height="130"> <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, @@ -173,7 +173,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,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,541,652,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,668,667,0,0,996,628,998,0,0,0,0,0,0,0,651,989,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,668,667,0,0,1012,628,1014,0,0,0,0,0,0,0,651,1005,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -189,99 +189,99 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,957,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,973,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,694,695,695,695,695,696,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,710,711,711,711,711,712,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,707,728,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,742,743,744,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,758,759,760,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,528,529,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,742,743,744,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,758,759,760,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,528,529,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,908,0,0,0,892,0,856,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,924,0,0,0,908,0,872,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,528,529,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,560,0,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,0,0,0,0,0,0,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,560,0,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,521,595,520,0,541,524,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,0,0,0,0,0,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,718,719,722,0,0,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,0,0,0,0,0,908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,718,719,722,0,0,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,734,735,738,0,0,0,0,661,0,661,0,0,661,0,676,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,0,0,0,0,0,770,0,0,0,0,0,0,0,0,0,0,0,0,0,0,750,751,0,0,0,0,739,0,0,0,0,0,0,741,692,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,659,0,528,529,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,766,767,0,0,0,0,691,0,0,0,0,0,0,741,692,0,0,892,0,0,0,0,0,0,0,0,0,0,0,908,941,925,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,545,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,755,756,756,756,756,756,756,757,708,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,510,510,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,560,0,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,941,119,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,925,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,892,0,957,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,957,925,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,957,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,957,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,941,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,957,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,718,719,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,925,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,734,735,0,0,0,0,0,0,0,0,0,0,0,0,0,595,0,0,0,0,0,0,0,0,0,925,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,750,751,0,0,0,0,0,0,0,0,0,659,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,766,767,0,0,0,0,0,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,541,0,0,0,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,0,0,0,0,0,770,0,0,0,0,0,0,0,0,0,0,0,0,0,0,750,751,0,0,0,0,739,0,0,0,0,0,0,741,692,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,659,0,528,529,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,766,767,0,0,0,0,691,0,0,0,0,0,0,741,692,0,0,908,0,0,0,0,0,0,0,0,0,0,0,924,957,941,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,545,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,755,756,756,756,756,756,756,757,708,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,510,510,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,560,0,562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,957,119,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,941,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,908,0,973,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,973,941,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,973,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,973,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,957,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,595,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,973,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,718,719,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,941,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,734,735,0,0,0,0,0,0,0,0,0,0,0,0,0,595,0,0,0,0,0,0,0,0,0,941,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,750,751,0,0,0,0,0,0,0,0,0,659,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,766,767,0,0,0,0,0,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,541,0,0,0,0,0,0,0,0,0,410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,520,522,0,612,0,523,0,612,0,612,521,522,0,0,0,0,0,0,0,0,0,0,0,0,0,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,510,0,628,0,510,0,628,0,628,0,395,0,0,0,0,525,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,957,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,510,0,0,0,510,0,0,0,0,0,0,0,0,0,0,541,0,541,0,0,0,0,0,0,0,0,395,497,498,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,925,925,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,510,0,0,989,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,957,0,0,0,0,0,0,0,0,0,941,0,925,957,957,925,0,957,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,510,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -925,957,941,925,957,925,925,941,957,925,957,925,941,925,957,925,0,0,957,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,510,510,0,0,0,0,0,0,0,0,510,510,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,925,0,0,0,941,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,0,521,523,523,0,510,510,510,510,0,0,0,0,494,0,0,510,510,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,520,522,0,612,0,523,0,612,0,612,521,522,0,0,0,0,0,0,0,0,0,0,0,0,0,908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,510,0,628,0,510,0,628,0,628,0,395,0,0,0,0,525,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,973,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,510,0,0,0,510,0,0,0,0,0,0,0,0,0,0,541,0,541,0,0,0,0,0,0,0,0,395,497,498,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,941,941,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,495,510,0,0,1005,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,973,0,0,0,0,0,0,0,0,0,957,0,941,973,973,941,0,973,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,510,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +941,973,957,941,973,941,941,957,973,941,973,941,957,941,973,941,0,0,973,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,510,510,0,0,0,0,0,0,0,0,510,510,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,941,0,0,0,957,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,612,0,521,523,523,0,510,510,510,510,0,0,0,0,494,0,0,510,510,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,628,0,0,395,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,0,0,0,0,0,0,989,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,510,0,0,0,0,0,0,1005,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="115" height="130"> + <layer id="3" name="Fringe" width="115" height="130"> <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, @@ -344,7 +344,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,999,1000,1001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1015,1016,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -352,7 +352,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,996,0,998,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1012,0,1014,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,823,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,541,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -365,8 +365,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,996,0,998,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,995,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1012,0,1014,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1011,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -389,11 +389,11 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,784,783,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,999,1000,1001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1015,1016,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,773,774,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -415,7 +415,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 </data> </layer> - <layer name="Over1" width="115" height="130"> + <layer id="4" name="Over1" width="115" height="130"> <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, @@ -427,12 +427,12 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,887,887,887,887,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,887,887,887,887,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,887,887,887,887,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,887,887,887,887,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,887,887,887,887,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,887,887,887,887,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,903,903,903,903,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,903,903,903,903,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,903,903,903,903,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,903,903,903,903,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,903,903,903,903,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,903,903,903,903,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -441,95 +441,95 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,997,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1013,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,646,647,647,647,647,647,647,648,0,0,0,0,0,889,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,908,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,646,647,647,647,647,647,647,648,0,0,0,0,0,905,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,685,0,0,652,688,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,957,0,0,0,0,0,0,0,0,0,0,0,0,0,688,0,684,0,0,702,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,890,890,890,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,989,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,973,0,0,0,0,0,0,0,0,0,0,0,0,0,688,0,684,0,0,702,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,906,906,906,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,1005,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,701,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,891,0,0,0,649,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,907,0,0,0,649,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,726,0,700,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,876,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,876,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,876,0,0,0,0,0,887,0,0,0,875,891,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,890,890,890,890,890,876,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,887,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,906,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,997,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,723,724,724,724,724,724,724,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,649,649,649,649,685,0,0,0,0,0,889,890,890,890,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,891,0,702,0,666,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,875,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,890,890,890,890,890,876,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,875,890,890,876,0,0,875,890,890,891,0,0,0,889,890,890,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,892,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,892,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,892,0,0,0,0,0,903,0,0,0,891,907,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,906,906,906,906,906,892,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,903,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,922,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1013,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,723,724,724,724,724,724,724,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,682,649,649,649,649,685,0,0,0,0,0,905,906,906,906,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,907,0,702,0,666,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,891,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,906,906,906,906,906,892,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,891,906,906,892,0,0,891,906,906,907,0,0,0,905,906,906,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,906,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,922,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,997,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1013,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,890,890,890,890,890,890,890,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,890,890,876,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,906,906,906,906,906,906,906,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,906,906,892,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,563,563,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,890,890,890,890,890,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,906,906,906,906,906,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,563,563,563,563,563,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,890,890,890,891,0,0,0,889,890,890,890,890,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,889,890,890,890,890,890,891,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,999,1000,1001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,875,890,890,890,890,890,876,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,563,906,906,906,907,0,0,0,905,906,906,906,906,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,906,906,906,906,906,906,906,906,906,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,905,906,906,906,906,906,907,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1015,1016,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,891,906,906,906,906,906,892,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,984,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -549,7 +549,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 </data> </layer> - <layer name="Collision" width="115" height="130"> + <layer id="5" name="Collision" width="115" height="130"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -683,131 +683,131 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="6" name="Objects" visible="0"> <object id="1" name="RedSlime" type="spawn" x="696" y="1480" width="704" height="448"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000"/> + <property name="death" value="30000"/> + <property name="spawn" value="100000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="6"/> </properties> </object> <object id="2" name="CaveMaggot" type="spawn" x="712" y="1444" width="640" height="480"> <properties> - <property name="eA_death" value="30000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="30000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="3"/> <property name="monster_id" value="54"/> </properties> </object> <object id="3" name="Spider" type="spawn" x="1760" y="3232" width="128" height="96"> <properties> - <property name="eA_death" value="250000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="250000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="1"/> <property name="monster_id" value="10"/> </properties> </object> <object id="4" name="Spider" type="spawn" x="1920" y="3232" width="96" height="96"> <properties> - <property name="eA_death" value="250000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="250000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="1"/> <property name="monster_id" value="10"/> </properties> </object> <object id="5" name="Spider" type="spawn" x="2048" y="3232" width="96" height="96"> <properties> - <property name="eA_death" value="250000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="250000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="1"/> <property name="monster_id" value="10"/> </properties> </object> <object id="6" name="BlackScorpion" type="spawn" x="2208" y="3456" width="160" height="96"> <properties> - <property name="eA_death" value="250000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="250000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="1"/> <property name="monster_id" value="7"/> </properties> </object> <object id="7" name="Bandit" type="spawn" x="1727" y="1230" width="428" height="1184"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="10000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="47"/> <property name="monster_id" value="62"/> </properties> </object> <object id="8" name="BanditLord" type="spawn" x="1696" y="1216" width="448" height="448"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="20000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="4"/> <property name="monster_id" value="63"/> </properties> </object> <object id="9" name="BanditLord" type="spawn" x="1640" y="2104" width="608" height="320"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="20000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="4"/> <property name="monster_id" value="63"/> </properties> </object> <object id="10" name="SleepingBandit" type="spawn" x="2024" y="3016" width="16" height="16"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="60000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="1"/> <property name="monster_id" value="97"/> </properties> </object> <object id="11" name="SleepingBandit" type="spawn" x="1703" y="2984" width="16" height="16"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="60000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="1"/> <property name="monster_id" value="97"/> </properties> </object> <object id="12" name="SleepingBandit" type="spawn" x="1544" y="2279" width="16" height="16"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="60000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="1"/> <property name="monster_id" value="97"/> </properties> </object> <object id="13" name="Bandit" type="spawn" x="960" y="768" width="576" height="416"> <properties> - <property name="eA_death" value="10000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="10000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="12"/> <property name="monster_id" value="62"/> </properties> </object> <object id="14" name="BanditLord" type="spawn" x="1088" y="928" width="384" height="288"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="20000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="2"/> <property name="monster_id" value="63"/> </properties> </object> <object id="15" name="CopperSlime" type="spawn" x="2400" y="3070" width="359" height="418"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="60000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="7"/> <property name="monster_id" value="96"/> </properties> </object> <object id="16" name="CopperSlime" type="spawn" x="1661" y="2974" width="628" height="193"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="60000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="7"/> <property name="monster_id" value="96"/> </properties> diff --git a/maps/052-1.tmx b/maps/052-1.tmx index 40470ebb..a919762b 100644 --- a/maps/052-1.tmx +++ b/maps/052-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="100" height="80" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="7"> <properties> <property name="minimap" value="graphics/minimaps/052-1.png"/> <property name="music" value="inquisitive-inn.ogg"/> @@ -17,7 +17,7 @@ <tileset firstgid="579" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="835" source="../tilesets/soulmenhirs_x2.tsx"/> <tileset firstgid="851" source="../tilesets/power_circle_x2.tsx"/> - <layer name="Ground1" width="100" height="80"> + <layer id="1" name="Ground1" width="100" height="80"> <data encoding="csv"> 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89, @@ -101,7 +101,7 @@ 89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89 </data> </layer> - <layer name="Ground2" width="100" height="80"> + <layer id="2" name="Ground2" width="100" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -185,7 +185,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 </data> </layer> - <layer name="Ground3" width="100" height="80"> + <layer id="3" name="Ground3" width="100" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -269,7 +269,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 </data> </layer> - <layer name="Fringe" width="100" height="80"> + <layer id="4" name="Fringe" width="100" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -353,7 +353,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 </data> </layer> - <layer name="Over1" width="100" height="80"> + <layer id="5" name="Over1" width="100" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -437,7 +437,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 </data> </layer> - <layer name="Collision" width="100" height="80"> + <layer id="6" name="Collision" width="100" height="80"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -521,19 +521,19 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> - <object name="AzulSlime" type="spawn" x="1088" y="320" width="1408" height="1280"> + <objectgroup id="7" name="Objects" visible="0"> + <object id="1" name="AzulSlime" type="spawn" x="1088" y="320" width="1408" height="1280"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="100000 "/> + <property name="death" value="20000"/> + <property name="spawn" value="100000 "/> <property name="max_beings" value="18"/> <property name="monster_id" value="98"/> </properties> </object> - <object name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1600" y="896"/> - <object name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1696" y="896"/> - <object name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1984" y="896"/> - <object name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1664" y="800"/> - <object name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1920" y="800"/> + <object id="2" name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1600" y="896"/> + <object id="3" name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1696" y="896"/> + <object id="4" name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1984" y="896"/> + <object id="5" name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1664" y="800"/> + <object id="6" name="graphics/particles/demonic-aura.particle.xml" type="particle_effect" x="1920" y="800"/> </objectgroup> </map> diff --git a/maps/052-2.tmx b/maps/052-2.tmx index 3cf68ce9..b48e05a4 100644 --- a/maps/052-2.tmx +++ b/maps/052-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="150" height="100" tilewidth="32" tileheight="32" nextobjectid="3"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="3"> <properties> <property name="music" value="inquisitive-inn.ogg"/> <property name="name" value="Illia forsaken inn"/> @@ -8,10 +8,10 @@ <tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="339" source="../tilesets/woodland_village.tsx"/> - <tileset firstgid="595" source="../tilesets/woodland_village_x2.tsx"/> - <tileset firstgid="611" source="../tilesets/witch_sisters_picture_x3.tsx"/> - <layer name="Ground1" width="150" height="100"> + <tileset firstgid="355" source="../tilesets/woodland_village.tsx"/> + <tileset firstgid="611" source="../tilesets/woodland_village_x2.tsx"/> + <tileset firstgid="627" source="../tilesets/witch_sisters_picture_x3.tsx"/> + <layer id="1" name="Ground1" width="150" height="100"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -115,7 +115,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="150" height="100"> + <layer id="2" name="Ground2" width="150" height="100"> <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, @@ -136,60 +136,60 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,17,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,32,0,0,0,34,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,32,0,0,0,34,29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,490,0,0,0,0,475,491,0,0,0,0,0,48,0,0,0,50,0,0,0,0,0,0,0,0,475,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,506,0,0,0,0,491,507,0,0,0,0,0,48,0,0,0,50,0,0,0,0,0,0,0,0,491,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,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,17,17,17,17,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,34,0,0,29,0,0,0,0,0,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,216,0,0,0,0,0,216,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,83,0,0,0,492,48,0,0,0,50,492,0,0,0,0,0,0,0,226,0,0,0,0,0,0,0,0,0,0,0,0,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,230,231,231,231,231,231,232,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,83,0,0,0,508,48,0,0,0,50,508,0,0,0,0,0,0,0,226,0,0,0,0,0,0,0,0,0,0,0,0,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,230,231,231,231,231,231,232,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,0,0,0,0,0,0,0,0,0,0,0,0,17,17,17,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,246,247,247,247,247,247,248,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,590,0,0,0,0,0,0,0,0,0,210,0,8,0,0,9,10,8,9,0,0,32,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,475,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,590,0,0,0,0,0,0,0,0,0,226,0,0,0,0,0,0,0,0,0,475,32,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,475,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,606,0,0,0,0,0,0,0,0,0,210,0,8,0,0,9,10,8,9,0,0,32,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,606,0,0,0,0,0,0,0,0,0,226,0,0,0,0,0,0,0,0,0,491,32,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,491,242,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,151,152,197,0,0,0,0,0,0,0,0,182,183,183,183,183,183,184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,152,0,150,0,152,0,150,0,152,0,0,0,0,0,0,0,0,149,0,0,149,0,149,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167,168,0,0,0,0,0,0,0,0,0,198,0,199,199,199,199,200,0,182,183,183,184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167,168,0,166,167,168,0,166,167,168,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,0,0,0,216,0,198,199,199,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,166,167,167,167,167,167,167,167,167,167,167,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,0,149,149,216,0,216,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,147,0,0,0,0,0,0,9,11,8,9,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,10,0,0,0,216,0,0,230,231,231,232,0,230,232,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,150,0,152,0,0,0,150,0,152,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,210,0,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,246,247,247,248,0,246,248,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,163,0,165,0,0,195,150,0,165,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,152,0,0,17,17,17,17,17,17,226,0,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,246,247,247,248,0,246,248,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,163,0,165,0,0,195,150,0,165,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,152,0,0,17,17,17,17,17,17,226,0,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,0,0,0,0,0,0,0,216,149,0,0,149,0,0,0,0,149,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,216,0,150,0,152,0,0,0,150,0,152,0,0,0,0,0,0,0,166,167,167,167,167,167,167,167,167,167,167,168,0,0,0,32,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,226,0,0,0,0,0,0,0,0,0,0,0,0,230,231,231,231,231,231,231,231,231,231,231,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,163,0,152,197,0,195,150,0,165,0,0,0,0,0,0,0,0,0,147,0,0,0,0,0,147,0,0,0,0,0,0,48,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,267,0,0,83,0,0,0,0,0,0,0,0,0,0,246,247,247,247,247,247,247,247,247,247,247,248,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,150,0,152,0,0,0,150,0,152,0,0,0,0,0,0,0,0,149,0,0,0,0,149,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,83,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,216,195,150,0,165,0,0,0,163,0,152,197,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,152,0,0,0,0,0,179,228,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,475,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,166,167,168,0,0,0,166,167,168,0,0,0,0,0,0,0,166,167,167,167,167,167,167,167,167,167,167,168,0,0,0,0,0,243,244,245,0,0,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,475,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,491,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,166,167,168,0,0,0,166,167,168,0,0,0,0,0,0,0,166,167,167,167,167,167,167,167,167,167,167,168,0,0,0,0,0,243,244,245,0,0,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,491,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,147,0,0,0,147,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,97,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,231,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,15,0,0,0,210,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,242,83,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,31,0,530,12,226,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,31,0,546,12,226,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,0,10,0,0,0,8,0,0,0,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,475,83,475,83,0,0,0,491,491,0,0,460,461,0,0,0,0,0,0,490,491,475,460,461,475,475,0,83,0,0,0,475,475,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,83,475,83,0,590,318,319,590,0,263,0,0,266,0,590,273,0,491,475,491,0,0,83,0,590,134,135,136,0,265,0,83,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,475,83,83,0,590,590,590,490,0,590,475,475,83,0,0,0,0,83,0,0,590,0,0,0,0,150,151,152,0,590,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,83,83,83,0,271,0,270,0,83,0,475,475,0,83,0,270,0,590,0,490,0,83,0,272,490,166,167,168,0,273,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,136,0,83,0,0,83,590,475,475,0,590,0,83,0,0,0,83,0,590,491,0,0,0,0,0,590,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,475,0,150,151,152,475,0,274,0,491,0,265,83,0,0,266,0,0,83,0,491,0,263,0,590,318,319,0,83,0,490,590,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167,168,0,491,0,590,270,0,0,491,0,590,590,590,0,0,490,0,83,0,0,460,461,0,266,0,0,83,83,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,83,491,83,0,0,0,507,507,0,0,476,477,0,0,0,0,0,0,506,507,491,476,477,491,491,0,83,0,0,0,491,491,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,83,491,83,0,606,318,319,606,0,263,0,0,266,0,606,273,0,507,491,507,0,0,83,0,606,134,135,136,0,265,0,83,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,491,83,83,0,606,606,606,506,0,606,491,491,83,0,0,0,0,83,0,0,606,0,0,0,0,150,151,152,0,606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,83,83,83,0,271,0,270,0,83,0,491,491,0,83,0,270,0,606,0,506,0,83,0,272,506,166,167,168,0,273,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,136,0,83,0,0,83,606,491,491,0,606,0,83,0,0,0,83,0,606,507,0,0,0,0,0,606,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,150,151,152,491,0,274,0,507,0,265,83,0,0,266,0,0,83,0,507,0,263,0,606,318,319,0,83,0,506,606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167,168,0,507,0,606,270,0,0,507,0,606,606,606,0,0,506,0,83,0,0,476,477,0,266,0,0,83,83,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,15,0,13,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,30,31,0,29,0,0,29,0,0,0,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,590,0,0,0,0,0,0,0,0,0,0,0,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,606,0,0,0,0,0,0,0,0,0,0,0,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,17,17,17,0,0,0,0,17,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,34,0,0,0,0,32,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,50,475,0,0,0,48,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,0,0,50,491,0,0,0,48,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,17,17,0,83,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,82,267,0,590,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,82,83,590,0,0,0,210,24,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,82,267,0,606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,82,83,606,0,0,0,210,24,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,82,0,0,0,0,0,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,82,0,0,0,0,0,17,17,17,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,82,0,0,0,0,13,32,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,0,0,29,0,0,0,0,0,0,13,0,14,15,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,0,0,82,0,0,0,0,29,32,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,203,204,205,210,0,0,210,0,0,0,0,0,0,29,0,30,31,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,97,97,97,98,0,0,0,0,12,32,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,219,220,221,226,0,0,226,13,490,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,97,97,97,98,0,0,0,0,12,32,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,219,220,221,226,0,0,226,13,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,236,237,0,0,0,0,29,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,32,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,252,253,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,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,0,0,0,0,48,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,227,228,229,197,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -197,7 +197,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,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,10,9,8,10,192,9,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,475,83,0,490,490,0,460,461,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,83,0,506,506,0,476,477,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -219,7 +219,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 </data> </layer> - <layer name="Ground3" width="150" height="100"> + <layer id="3" name="Ground3" width="150" height="100"> <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, @@ -251,7 +251,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,475,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -323,7 +323,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 </data> </layer> - <layer name="Fringe" width="150" height="100"> + <layer id="4" name="Fringe" width="150" height="100"> <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, @@ -348,7 +348,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,601,602,259,260,0,307,0,0,0,311,310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,268,617,618,259,260,0,307,0,0,0,311,310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -396,7 +396,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,611,612,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,627,628,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,311,313,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -427,7 +427,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 </data> </layer> - <layer name="Over" width="150" height="100"> + <layer id="5" name="Over" width="150" height="100"> <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, @@ -459,12 +459,12 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,136,0,0,0,0,0,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,136,0,134,135,136,0,134,135,136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,190,0,0,175,191,0,0,175,137,0,0,0,0,0,0,0,134,135,135,135,135,135,135,135,135,135,135,136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,0,0,0,0,0,188,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,0,0,0,509,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,0,0,0,0,0,188,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,214,0,0,0,0,0,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,214,0,134,135,136,0,0,0,134,135,136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,191,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,135,135,135,135,135,135,135,135,135,136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,0,0,0,0,175,0,0,0,0,0,0,0,0,0,175,0,0,190,0,0,0,0,175,0,0,0,0,64,66,0,0,64,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,492,0,0,0,0,0,0,0,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,508,0,0,0,0,0,0,0,0,0,0,509,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,0,0,0,0,175,0,0,0,0,0,0,0,0,134,135,135,135,135,135,135,135,135,135,135,136,0,0,0,0,0,211,212,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,0,176,0,0,0,173,0,175,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -531,7 +531,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 </data> </layer> - <layer name="Collision" width="150" height="100"> + <layer id="6" name="Collision" width="150" height="100"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -635,7 +635,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" visible="0"> + <objectgroup id="7" name="Objects" visible="0"> <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2784" y="768" width="16" height="16"/> <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2848" y="768" width="16" height="16"/> </objectgroup> diff --git a/maps/055-1.tmx b/maps/055-1.tmx index f82f7ccb..c9f2f348 100644 --- a/maps/055-1.tmx +++ b/maps/055-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="170" height="124" tilewidth="32" tileheight="32" nextobjectid="28"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="170" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="28"> <properties> <property name="minimap" value="graphics/minimaps/055-1.png"/> <property name="music" value="mystique-forest.ogg"/> @@ -14,7 +14,7 @@ <tileset firstgid="259" source="../tilesets/woodland_x2.tsx"/> <tileset firstgid="291" source="../tilesets/woodland_x3.tsx"/> <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> - <layer name="Ground1" width="170" height="124"> + <layer id="1" name="Ground1" width="170" height="124"> <data encoding="csv"> 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, @@ -142,7 +142,7 @@ 213,251,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,43,44,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,196,182,212,19,19,19,19,19,19,35,35,35,35,35,35,35,35,35,19,19,19,243,234,199,199,199,199,199,199,199,199,228,213,229,19,19,19,19,19,19,19,19,19,19,19,19,19,19,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89 </data> </layer> - <layer name="Ground2" width="170" height="124"> + <layer id="2" name="Ground2" width="170" height="124"> <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,245,0,0,0,0,0,0,0,0,0,0,0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -270,7 +270,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,235,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,0,0,230,169,167,167,167,167,167,167,170,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="170" height="124"> + <layer id="3" name="Fringe" width="170" height="124"> <data encoding="csv"> 0,291,292,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,293,294,0,293,294,0,0,0,293,294,0,0,0,0,0,293,294,0,0,291,292,0,0,293,294,0,0,0,0,0,0,0,0,0,291,292,293,294,0,0,0,293,294,291,292,293,294,291,292,0,291,292,0,0,0,0,293,294,293,294,293,294,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,291,292,0,291,292,0,293,294,0,291,292,293,294,0,291,292,0,0,0,0,0,293,294,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,293,294,0,293,294,0,0,0,0,293,294,291,292,291,292,0,0,293,294,291,292,291,292,0,291,292,293,294,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -398,7 +398,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,291,292,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="170" height="124"> + <layer id="4" name="Over1" width="170" height="124"> <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,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -526,7 +526,7 @@ 0,0,0,171,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="170" height="124"> + <layer id="5" name="Over2" width="170" height="124"> <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, @@ -654,7 +654,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,89,0,0,0,0,89,89,89,89,0,89,89,0,0,89,89 </data> </layer> - <layer name="Collision" width="170" height="124"> + <layer id="6" name="Collision" width="170" height="124"> <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, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -782,25 +782,25 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Cave" type="warp" x="3200" y="2656" width="32" height="32"> <properties> <property name="dest_map" value="055-3"/> - <property name="dest_tile_x" value="30"/> - <property name="dest_tile_y" value="27"/> + <property name="dest_x" value="30"/> + <property name="dest_y" value="27"/> </properties> </object> <object id="2" name="To Cave" type="warp" x="3200" y="2848" width="32" height="32"> <properties> <property name="dest_map" value="055-3"/> - <property name="dest_tile_x" value="50"/> - <property name="dest_tile_y" value="42"/> + <property name="dest_x" value="50"/> + <property name="dest_y" value="42"/> </properties> </object> <object id="3" name="Butterfly" type="spawn" x="1836" y="2036" width="750" height="654"> <properties> - <property name="eA_death" value="85000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="85000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="16"/> <property name="monster_id" value="53"/> </properties> @@ -808,126 +808,126 @@ <object id="4" name="To Woodland Hills" type="warp" x="704" y="1600" width="32" height="128"> <properties> <property name="dest_map" value="013-1"/> - <property name="dest_tile_x" value="135"/> - <property name="dest_tile_y" value="51"/> + <property name="dest_x" value="135"/> + <property name="dest_y" value="51"/> </properties> </object> <object id="5" name="Silkworm" type="spawn" x="1928" y="724" width="1794" height="494"> <properties> - <property name="eA_death" value="85000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="85000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="33"/> </properties> </object> <object id="6" name="Squirrel" type="spawn" x="1204" y="716" width="2750" height="602"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="36"/> </properties> </object> <object id="7" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="85000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="85000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="15"/> <property name="monster_id" value="26"/> </properties> </object> <object id="8" name="CloverPatch" type="spawn" x="2819" y="1511" width="244" height="180"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="180000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> </properties> </object> <object id="9" name="CloverPatch" type="spawn" x="3235" y="1724" width="213" height="157"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="180000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> </properties> </object> <object id="10" name="CloverPatch" type="spawn" x="1653" y="2164" width="916" height="548"> <properties> - <property name="eA_death" value="120000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="120000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="35"/> </properties> </object> <object id="11" name="Snail" type="spawn" x="1268" y="714" width="2681" height="833"> <properties> - <property name="eA_death" value="85000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="85000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="39"/> </properties> </object> <object id="12" name="AlizarinPlant" type="spawn" x="1993" y="1936" width="588" height="806"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="60000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="30"/> </properties> </object> <object id="13" name="AlizarinPlant" type="spawn" x="1329" y="702" width="2628" height="746"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="60000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="30"/> </properties> </object> <object id="14" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="55000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="55000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="27"/> </properties> </object> <object id="15" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="60000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="28"/> </properties> </object> <object id="16" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="60000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="29"/> </properties> </object> <object id="17" name="PinkFlower" type="spawn" x="3678" y="1896" width="188" height="126"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="12"/> </properties> </object> <object id="18" name="PinkFlower" type="spawn" x="3049" y="1908" width="183" height="116"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="12"/> </properties> </object> <object id="19" name="PinkFlower" type="spawn" x="1708" y="2109" width="787" height="590"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="1"/> <property name="monster_id" value="12"/> </properties> @@ -935,28 +935,28 @@ <object id="20" name="To Cave" type="warp" x="4384" y="3072" width="32" height="32"> <properties> <property name="dest_map" value="055-3"/> - <property name="dest_tile_x" value="76"/> - <property name="dest_tile_y" value="39"/> + <property name="dest_x" value="76"/> + <property name="dest_y" value="39"/> </properties> </object> <object id="21" name="To Cave" type="warp" x="1920" y="2976" width="32" height="32"> <properties> <property name="dest_map" value="055-3"/> - <property name="dest_tile_x" value="96"/> - <property name="dest_tile_y" value="70"/> + <property name="dest_x" value="96"/> + <property name="dest_y" value="70"/> </properties> </object> <object id="22" name="To Woods" type="warp" x="2368" y="640" width="64" height="32"> <properties> <property name="dest_map" value="017-1"/> - <property name="dest_tile_x" value="188"/> - <property name="dest_tile_y" value="103"/> + <property name="dest_x" value="188"/> + <property name="dest_y" value="103"/> </properties> </object> <object id="23" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="60000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="17"/> </properties> @@ -964,8 +964,8 @@ <object id="24" name="To Woodland" type="warp" x="4768" y="1984" width="32" height="96"> <properties> <property name="dest_map" value="057-1"/> - <property name="dest_tile_x" value="20"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="20"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="25" name="Pumpkin" type="node" x="1312" y="704" width="224" height="288"/> diff --git a/maps/055-3.tmx b/maps/055-3.tmx index 6b4e4d66..d2e1dff8 100644 --- a/maps/055-3.tmx +++ b/maps/055-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" width="150" height="150" tilewidth="32" tileheight="32"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="25"> <properties> <property name="minimap" value="graphics/minimaps/055-3.png"/> <property name="music" value="cavesong.ogg"/> @@ -9,7 +9,7 @@ <tileset firstgid="3" source="../tilesets/cave.tsx"/> <tileset firstgid="131" source="../tilesets/cave_x2.tsx"/> <tileset firstgid="147" source="../tilesets/cave_bilevel.tsx"/> - <layer name="Ground1" width="150" height="150"> + <layer id="1" name="Ground1" width="150" height="150"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -163,7 +163,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Ground2" width="150" height="150"> + <layer id="2" name="Ground2" width="150" height="150"> <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, @@ -317,7 +317,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 </data> </layer> - <layer name="Fringe" width="150" height="150"> + <layer id="3" name="Fringe" width="150" height="150"> <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, @@ -471,7 +471,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 </data> </layer> - <layer name="Over1" width="150" height="150"> + <layer id="4" name="Over1" width="150" height="150"> <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, @@ -625,7 +625,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 </data> </layer> - <layer name="Collision" width="150" height="150"> + <layer id="5" name="Collision" width="150" height="150"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -779,119 +779,119 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects" width="0" height="0" visible="0"> - <object name="To Woodland Hills" type="warp" x="2432" y="1280" width="64" height="32"> + <objectgroup id="6" name="Objects" visible="0"> + <object id="1" name="To Woodland Hills" type="warp" x="2432" y="1280" width="64" height="32"> <properties> <property name="dest_map" value="055-1"/> - <property name="dest_tile_x" value="137"/> - <property name="dest_tile_y" value="97"/> + <property name="dest_x" value="137"/> + <property name="dest_y" value="97"/> </properties> </object> - <object name="To Woodland Hills" type="warp" x="960" y="832" width="32" height="32"> + <object id="2" name="To Woodland Hills" type="warp" x="960" y="832" width="32" height="32"> <properties> <property name="dest_map" value="055-1"/> - <property name="dest_tile_x" value="100"/> - <property name="dest_tile_y" value="82"/> + <property name="dest_x" value="100"/> + <property name="dest_y" value="82"/> </properties> </object> - <object name="To Outside" type="warp" x="1600" y="1376" width="32" height="32"> + <object id="3" name="To Outside" type="warp" x="1600" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="055-1"/> - <property name="dest_tile_x" value="100"/> - <property name="dest_tile_y" value="90"/> + <property name="dest_x" value="100"/> + <property name="dest_y" value="90"/> </properties> </object> - <object name="To Woodland Hills" type="warp" x="3040" y="2272" width="64" height="32"> + <object id="4" name="To Woodland Hills" type="warp" x="3040" y="2272" width="64" height="32"> <properties> <property name="dest_map" value="055-1"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="94"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="94"/> </properties> </object> - <object name="To Cave" type="warp" x="1824" y="3072" width="64" height="32"> + <object id="5" name="To Cave" type="warp" x="1824" y="3072" width="64" height="32"> <properties> <property name="dest_map" value="055-3"/> - <property name="dest_tile_x" value="98"/> - <property name="dest_tile_y" value="115"/> + <property name="dest_x" value="98"/> + <property name="dest_y" value="115"/> </properties> </object> - <object name="To Cave" type="warp" x="3136" y="3648" width="32" height="32"> + <object id="6" name="To Cave" type="warp" x="3136" y="3648" width="32" height="32"> <properties> <property name="dest_map" value="055-3"/> - <property name="dest_tile_x" value="57"/> - <property name="dest_tile_y" value="95"/> + <property name="dest_x" value="57"/> + <property name="dest_y" value="95"/> </properties> </object> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="928" y="928" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="992" y="928" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1056" y="1376" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1344" y="2272" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="832" y="1888" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="1664" y="2720" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3296" y="3904" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3904" y="3520" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3840" y="2624" width="32" height="32"/> - <object name="graphics/particles/flame.particle.xml" type="particle_effect" x="3232" y="2112" width="32" height="32"/> - <object name="RedSlime" type="spawn" x="1125" y="1201" width="681" height="486"> + <object id="7" name="graphics/particles/flame.particle.xml" type="particle_effect" x="928" y="928" width="32" height="32"/> + <object id="8" name="graphics/particles/flame.particle.xml" type="particle_effect" x="992" y="928" width="32" height="32"/> + <object id="9" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1056" y="1376" width="32" height="32"/> + <object id="10" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1344" y="2272" width="32" height="32"/> + <object id="11" name="graphics/particles/flame.particle.xml" type="particle_effect" x="832" y="1888" width="32" height="32"/> + <object id="12" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1664" y="2720" width="32" height="32"/> + <object id="13" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3296" y="3904" width="32" height="32"/> + <object id="14" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3904" y="3520" width="32" height="32"/> + <object id="15" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3840" y="2624" width="32" height="32"/> + <object id="16" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3232" y="2112" width="32" height="32"/> + <object id="17" name="RedSlime" type="spawn" x="1125" y="1201" width="681" height="486"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="60000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="6"/> </properties> </object> - <object name="Bat" type="spawn" x="0" y="0" width="32" height="32"> + <object id="18" name="Bat" type="spawn" x="0" y="0" width="32" height="32"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="20"/> <property name="monster_id" value="15"/> </properties> </object> - <object name="YellowSlime" type="spawn" x="1265" y="1774" width="936" height="1343"> + <object id="19" name="YellowSlime" type="spawn" x="1265" y="1774" width="936" height="1343"> <properties> - <property name="eA_death" value="60000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="60000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="5"/> </properties> </object> - <object name="BlackScorpion" type="spawn" x="0" y="0" width="32" height="32"> + <object id="20" name="BlackScorpion" type="spawn" x="0" y="0" width="32" height="32"> <properties> - <property name="eA_death" value="35000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="35000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="7"/> </properties> </object> - <object name="Spider" type="spawn" x="0" y="0" width="32" height="32"> + <object id="21" name="Spider" type="spawn" x="0" y="0" width="32" height="32"> <properties> - <property name="eA_death" value="35000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="35000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="10"/> </properties> </object> - <object name="Snake" type="spawn" x="0" y="0" width="32" height="32"> + <object id="22" name="Snake" type="spawn" x="0" y="0" width="32" height="32"> <properties> - <property name="eA_death" value="20000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="20000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="8"/> </properties> </object> - <object name="Spider" type="spawn" x="1248" y="1120" width="480" height="608"> + <object id="23" name="Spider" type="spawn" x="1248" y="1120" width="480" height="608"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="50000"/> + <property name="death" value="100000"/> + <property name="spawn" value="50000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="10"/> </properties> </object> - <object name="BlackScorpion" type="spawn" x="1088" y="2144" width="1184" height="768"> + <object id="24" name="BlackScorpion" type="spawn" x="1088" y="2144" width="1184" height="768"> <properties> - <property name="eA_death" value="100000"/> - <property name="eA_spawn" value="50000"/> + <property name="death" value="100000"/> + <property name="spawn" value="50000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="7"/> </properties> diff --git a/maps/056-2.tmx b/maps/056-2.tmx index 348832e9..7bd04110 100644 --- a/maps/056-2.tmx +++ b/maps/056-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="120" height="60" tilewidth="32" tileheight="32" nextobjectid="5"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="120" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="5"> <properties> <property name="music" value="magick-real.ogg"/> <property name="name" value="Mirak's House"/> @@ -8,8 +8,8 @@ <tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/> <tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/> - <tileset firstgid="339" source="../tilesets/pots_x2.tsx"/> - <layer name="Ground1" width="120" height="60"> + <tileset firstgid="355" source="../tilesets/pots_x2.tsx"/> + <layer id="1" name="Ground1" width="120" height="60"> <data encoding="csv"> 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51, @@ -73,7 +73,7 @@ 51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51 </data> </layer> - <layer name="Ground2" width="120" height="60"> + <layer id="2" name="Ground2" width="120" height="60"> <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, @@ -137,7 +137,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="60"> + <layer id="3" name="Fringe" width="120" height="60"> <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, @@ -165,12 +165,12 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,311,311,311,312,311,311,312,311,311,311,311,311,311,311,311,311,311,311,311,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,365,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,311,311,311,311,311,311,311,311,311,312,311,311,311,311,311,311,311,312,311,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,0,0,0,0,0,347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,365,0,0,0,0,0,363,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,312,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,363,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,9,11,11,8,9,11,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -201,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,0,0,0,0,0,0,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="120" height="60"> + <layer id="4" name="Over1" width="120" height="60"> <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, @@ -265,7 +265,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="60"> + <layer id="5" name="Collision" width="120" height="60"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -329,20 +329,20 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="6" name="Objects"> <object id="1" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="2176" y="1120" width="32" height="32"/> <object id="2" name="To First Floor" type="warp" x="2016" y="1088" width="32" height="32"> <properties> <property name="dest_map" value="056-2"/> - <property name="dest_tile_x" value="23"/> - <property name="dest_tile_y" value="32"/> + <property name="dest_x" value="23"/> + <property name="dest_y" value="32"/> </properties> </object> <object id="3" name="To Woods" type="warp" x="1120" y="960" width="32" height="32"> <properties> <property name="dest_map" value="017-1"/> - <property name="dest_tile_x" value="169"/> - <property name="dest_tile_y" value="90"/> + <property name="dest_x" value="169"/> + <property name="dest_y" value="90"/> </properties> </object> <object id="4" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="736" y="1056" width="32" height="32"/> diff --git a/maps/057-1.tmx b/maps/057-1.tmx index 022f928b..f9e73099 100644 --- a/maps/057-1.tmx +++ b/maps/057-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" width="170" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="21"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="170" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="21"> <properties> <property name="minimap" value="graphics/minimaps/057-1.png"/> <property name="music" value="mystique-forest.ogg"/> @@ -16,7 +16,6 @@ <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> <tileset firstgid="579" source="../tilesets/woodland_x5.tsx"/> <tileset firstgid="595" source="../tilesets/mushrooms_x2.tsx"/> - <tileset firstgid="735" source="../tilesets/mushrooms_x2.tsx"/> <layer id="1" name="Ground1" width="170" height="124"> <data encoding="csv"> 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19, @@ -466,7 +465,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,579,580,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,582,583,584,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,755,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,615,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,293,294,293,294,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -916,128 +915,128 @@ <objectgroup id="8" name="Objects"> <object id="1" name="MauvePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="45000"/> + <property name="death" value="45000"/> + <property name="spawn" value="45000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="27"/> </properties> </object> <object id="2" name="CobaltPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="65000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="65000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="28"/> </properties> </object> <object id="3" name="GambogePlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="5"/> <property name="monster_id" value="29"/> </properties> </object> <object id="4" name="AlizarinPlant" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="70000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="70000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="30"/> </properties> </object> <object id="5" name="Mouboo" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="14"/> <property name="monster_id" value="26"/> </properties> </object> <object id="6" name="Butterfly" type="spawn" x="2592" y="1239" width="986" height="338"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="40000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="53"/> </properties> </object> <object id="7" name="Silkworm" type="spawn" x="666" y="823" width="410" height="1518"> <properties> - <property name="eA_death" value="15000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="15000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="7"/> <property name="monster_id" value="33"/> </properties> </object> <object id="8" name="PinkFlower" type="spawn" x="2845" y="1052" width="764" height="553"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="12"/> </properties> </object> <object id="9" name="Butterfly" type="spawn" x="2941" y="810" width="643" height="409"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="40000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="53"/> </properties> </object> <object id="10" name="Butterfly" type="spawn" x="2467" y="1874" width="433" height="440"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="40000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="53"/> </properties> </object> <object id="11" name="Butterfly" type="spawn" x="1775" y="952" width="305" height="392"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="40000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="53"/> </properties> </object> <object id="12" name="Butterfly" type="spawn" x="915" y="1283" width="305" height="392"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="40000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="53"/> </properties> </object> <object id="13" name="Butterfly" type="spawn" x="4435" y="934" width="433" height="440"> <properties> - <property name="eA_death" value="40000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="40000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="53"/> </properties> </object> <object id="14" name="PinkFlower" type="spawn" x="3139" y="2014" width="426" height="385"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="12"/> </properties> </object> <object id="15" name="PinkFlower" type="spawn" x="4129" y="1538" width="426" height="385"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="2"/> <property name="monster_id" value="12"/> </properties> </object> <object id="16" name="SpikyMushroom" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="45000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="45000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="10"/> <property name="monster_id" value="17"/> </properties> @@ -1045,22 +1044,22 @@ <object id="17" name="To Woodland Hills" type="warp" x="608" y="1984" width="32" height="96"> <properties> <property name="dest_map" value="055-1"/> - <property name="dest_tile_x" value="148"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="148"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="18" name="CloverPatch" type="spawn" x="0" y="0"> <properties> - <property name="eA_death" value="180000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="180000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="3"/> <property name="monster_id" value="35"/> </properties> </object> <object id="19" name="Squirrel" type="spawn" x="640" y="640" width="488" height="1704"> <properties> - <property name="eA_death" value="50000"/> - <property name="eA_spawn" value="10000"/> + <property name="death" value="50000"/> + <property name="spawn" value="10000"/> <property name="max_beings" value="6"/> <property name="monster_id" value="36"/> </properties> diff --git a/maps/058-1.tmx b/maps/058-1.tmx index 153efec2..0314d14e 100644 --- a/maps/058-1.tmx +++ b/maps/058-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="132" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="38"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="132" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="38"> <properties> <property name="music" value="peace.ogg"/> <property name="name" value="Pyramid B1F"/> diff --git a/maps/058-2.tmx b/maps/058-2.tmx index 3deef3be..a785432c 100644 --- a/maps/058-2.tmx +++ b/maps/058-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="132" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="38"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="132" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="38"> <properties> <property name="music" value="peace.ogg"/> <property name="name" value="Pyramid B1F"/> diff --git a/maps/069-2.tmx b/maps/069-2.tmx index fc0a8a23..ce44f443 100644 --- a/maps/069-2.tmx +++ b/maps/069-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="143" height="148" tilewidth="32" tileheight="32" infinite="0" nextobjectid="18"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="143" height="148" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="18"> <properties> <property name="minimap" value="graphics/minimaps/069-2.png"/> <property name="music" value="faith.ogg"/> @@ -20,7 +20,7 @@ <tileset firstgid="1606" source="../tilesets/desert_castle_interior_x5.tsx"/> <tileset firstgid="1622" source="../tilesets/wood_lab.tsx"/> <tileset firstgid="1634" source="../tilesets/inn_x2.tsx"/> - <layer name="Ground1" width="143" height="148"> + <layer id="1" name="Ground1" width="143" height="148"> <data encoding="csv"> 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249, @@ -172,7 +172,7 @@ 249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249,249 </data> </layer> - <layer name="Ground2" width="143" height="148"> + <layer id="2" name="Ground2" width="143" height="148"> <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, @@ -324,7 +324,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 </data> </layer> - <layer name="Ground3" width="143" height="148"> + <layer id="3" name="Ground3" width="143" height="148"> <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, @@ -476,7 +476,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 </data> </layer> - <layer name="Fringe" width="143" height="148"> + <layer id="4" name="Fringe" width="143" height="148"> <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, @@ -628,7 +628,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 </data> </layer> - <layer name="Over1" width="143" height="148"> + <layer id="5" name="Over1" width="143" height="148"> <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, @@ -780,7 +780,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 </data> </layer> - <layer name="Over2" width="143" height="148"> + <layer id="6" name="Over2" width="143" height="148"> <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, @@ -932,7 +932,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 </data> </layer> - <layer name="Collision" width="143" height="148"> + <layer id="7" name="Collision" width="143" height="148"> <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -1084,106 +1084,106 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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> - <objectgroup name="Objects"> + <objectgroup id="8" name="Objects"> <object id="1" name="to Outdoors" type="warp" x="768" y="992" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="32"/> - <property name="dest_tile_y" value="99"/> + <property name="dest_x" value="32"/> + <property name="dest_y" value="99"/> <property name="ignore" value="this"/> </properties> </object> <object id="2" name="to Outdoors" type="warp" x="1760" y="992" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="79"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="79"/> <property name="ignore" value="this"/> </properties> </object> <object id="3" name="to Outdoors" type="warp" x="2752" y="992" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="24"/> - <property name="dest_tile_y" value="57"/> + <property name="dest_x" value="24"/> + <property name="dest_y" value="57"/> <property name="ignore" value="this"/> </properties> </object> <object id="4" name="to Outdoors" type="warp" x="3744" y="992" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="33"/> - <property name="dest_tile_y" value="40"/> + <property name="dest_x" value="33"/> + <property name="dest_y" value="40"/> <property name="ignore" value="this"/> </properties> </object> <object id="5" name="to Outdoors" type="warp" x="768" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="79"/> - <property name="dest_tile_y" value="40"/> + <property name="dest_x" value="79"/> + <property name="dest_y" value="40"/> <property name="ignore" value="this"/> </properties> </object> <object id="6" name="to Outdoors" type="warp" x="1760" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="87"/> - <property name="dest_tile_y" value="57"/> + <property name="dest_x" value="87"/> + <property name="dest_y" value="57"/> <property name="ignore" value="this"/> </properties> </object> <object id="7" name="to Outdoors" type="warp" x="2752" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="87"/> - <property name="dest_tile_y" value="79"/> + <property name="dest_x" value="87"/> + <property name="dest_y" value="79"/> <property name="ignore" value="this"/> </properties> </object> <object id="8" name="to Outdoors" type="warp" x="3744" y="1984" width="32" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="79"/> - <property name="dest_tile_y" value="100"/> + <property name="dest_x" value="79"/> + <property name="dest_y" value="100"/> <property name="ignore" value="this"/> </properties> </object> <object id="9" name="to Outdoors" type="warp" x="1376" y="4064" width="128" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="56"/> - <property name="dest_tile_y" value="56"/> + <property name="dest_x" value="56"/> + <property name="dest_y" value="56"/> <property name="ignore" value="this"/> </properties> </object> <object id="10" name="to Throne" type="warp" x="1376" y="2656" width="128" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="106"/> - <property name="dest_tile_y" value="116"/> + <property name="dest_x" value="106"/> + <property name="dest_y" value="116"/> </properties> </object> <object id="12" name="to Main Floor" type="warp" x="3360" y="3744" width="128" height="32"> <properties> <property name="dest_map" value="069-2"/> - <property name="dest_tile_x" value="44"/> - <property name="dest_tile_y" value="84"/> + <property name="dest_x" value="44"/> + <property name="dest_y" value="84"/> </properties> </object> <object id="13" name="to Parapet" type="warp" x="3680" y="4064" width="96" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="58"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="58"/> + <property name="dest_y" value="41"/> <property name="ignore" value="this"/> </properties> </object> <object id="14" name="to Parapet" type="warp" x="3072" y="4064" width="96" height="32"> <properties> <property name="dest_map" value="009-8"/> - <property name="dest_tile_x" value="53"/> - <property name="dest_tile_y" value="41"/> + <property name="dest_x" value="53"/> + <property name="dest_y" value="41"/> <property name="ignore" value="this"/> </properties> </object> diff --git a/maps/070-1.tmx b/maps/070-1.tmx index a10aa08e..6c5f68d3 100644 --- a/maps/070-1.tmx +++ b/maps/070-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="190" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="36"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="190" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="36"> <properties> <property name="music" value="thunderstorm.ogg"/> <property name="name" value="Underworld"/> diff --git a/maps/070-3.tmx b/maps/070-3.tmx index 7605ce58..2ce9d3f9 100644 --- a/maps/070-3.tmx +++ b/maps/070-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="91" height="93" tilewidth="32" tileheight="32" nextobjectid="25"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="91" height="93" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="25"> <properties> <property name="music" value="graveyard.ogg"/> <property name="name" value="The Abyss"/> @@ -7,7 +7,7 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/crypt_reaper_room.tsx"/> <tileset firstgid="179" source="../tilesets/crypt_x8.tsx"/> - <layer name="Ground" width="91" height="93"> + <layer id="1" name="Ground" width="91" height="93"> <data encoding="csv"> 55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55, 55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55, @@ -104,7 +104,7 @@ 55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,55,56,57,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56 </data> </layer> - <layer name="Ground2" width="91" height="93"> + <layer id="2" name="Ground2" width="91" height="93"> <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, @@ -201,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,0 </data> </layer> - <layer name="Fringe" width="91" height="93"> + <layer id="3" name="Fringe" width="91" height="93"> <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, @@ -298,7 +298,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 </data> </layer> - <layer name="Over" width="91" height="93"> + <layer id="4" name="Over" width="91" height="93"> <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, @@ -395,7 +395,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 </data> </layer> - <layer name="Collision" width="91" height="93" opacity="0.93"> + <layer id="5" name="Collision" width="91" height="93" opacity="0.93"> <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,2,2,2,2,2,2,2,2,2,2,2,2, @@ -492,7 +492,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,2,2,2,2,2,2 </data> </layer> - <objectgroup name="Objects" visible="0"> + <objectgroup id="6" name="Objects" visible="0"> <object id="1" name="graphics/particles/soulpool.xml" type="particle_effect" x="1152" y="1952" width="32" height="32"/> <object id="2" name="graphics/particles/flowing-blood.xml" type="particle_effect" x="1152" y="1984" width="32" height="32"/> <object id="3" name="graphics/particles/fountain-blood.xml" type="particle_effect" x="1088" y="1824" width="32" height="32"/> diff --git a/maps/099-1.tmx b/maps/099-1.tmx index 43ec1941..ec6a9b48 100644 --- a/maps/099-1.tmx +++ b/maps/099-1.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="81"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="81"> <properties> <property name="music" value="ominous3.ogg"/> <property name="name" value="Keshlam's Adventurer's Guild"/> @@ -1255,246 +1255,246 @@ <object id="1" name="To Room" type="warp" x="928" y="480" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="2" name="To Room" type="warp" x="2464" y="480" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="3" name="To Room" type="warp" x="3360" y="224" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="90"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="90"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="4" name="To Room" type="warp" x="2912" y="4320" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="5" name="To Room" type="warp" x="640" y="3648" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="6" name="To Room" type="warp" x="3104" y="2688" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="10" name="To Room" type="warp" x="3808" y="3712" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="72"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="72"/> + <property name="dest_y" value="26"/> </properties> </object> <object id="12" name="To Room" type="warp" x="3584" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="13" name="To Room" type="warp" x="2048" y="3616" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="48"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="48"/> </properties> </object> <object id="14" name="To Room" type="warp" x="2048" y="2272" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="15" name="To Room" type="warp" x="1344" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="16" name="To Room" type="warp" x="2944" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="17" name="To Room" type="warp" x="480" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="18" name="To Room" type="warp" x="1344" y="3968" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="19" name="To Room" type="warp" x="3616" y="1920" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="21" name="To Room" type="warp" x="4192" y="2560" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="22" name="To Room" type="warp" x="2304" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="23" name="To Room" type="warp" x="1504" y="2912" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="26"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="26"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="24" name="To Room" type="warp" x="3264" y="736" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="25" name="To Room" type="warp" x="3840" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="26" name="To Room" type="warp" x="3104" y="3328" width="32" height="32"> <properties> <property name="dest_map" value="099-2"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="28" name="To Room" type="warp" x="1536" y="480" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="29" name="To Room" type="warp" x="2432" y="768" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="30" name="To Room" type="warp" x="4096" y="512" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="41"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="41"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="31" name="To Room" type="warp" x="3520" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="47"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="47"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="32" name="To Room" type="warp" x="3840" y="2464" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="53"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="53"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="33" name="To Room" type="warp" x="3616" y="3072" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="34" name="To Room" type="warp" x="4000" y="3072" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="79"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="79"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="35" name="To Room" type="warp" x="1920" y="2912" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="85"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="85"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="36" name="To Room" type="warp" x="640" y="1696" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="38" name="To Room" type="warp" x="448" y="1792" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="39" name="To Room" type="warp" x="704" y="2208" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="103"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="103"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="40" name="To Room" type="warp" x="608" y="2944" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="109"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="109"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="41" name="To Room" type="warp" x="1824" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-3"/> - <property name="dest_tile_x" value="115"/> - <property name="dest_tile_y" value="63"/> + <property name="dest_x" value="115"/> + <property name="dest_y" value="63"/> </properties> </object> <object id="52" name="To Room" type="warp" x="4096" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> </objectgroup> @@ -1502,211 +1502,211 @@ <object id="43" name="To Room" type="warp" x="672" y="480" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="44" name="To Room" type="warp" x="1248" y="480" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="45" name="To Room" type="warp" x="1856" y="480" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="46" name="To Room" type="warp" x="2144" y="480" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="47" name="To Room" type="warp" x="2720" y="480" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="48" name="To Room" type="warp" x="3104" y="224" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="49" name="To Room" type="warp" x="3104" y="960" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="26"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="26"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="50" name="To Room" type="warp" x="3328" y="960" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="90"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="90"/> + <property name="dest_y" value="21"/> </properties> </object> <object id="51" name="To Room" type="warp" x="3456" y="736" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="54" name="To Room" type="warp" x="3168" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="56" name="To Room" type="warp" x="2624" y="1376" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="58" name="To Room" type="warp" x="2624" y="768" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="59" name="To Room" type="warp" x="2208" y="768" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="132"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="132"/> </properties> </object> <object id="60" name="To Room" type="warp" x="3040" y="1920" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="61" name="To Room" type="warp" x="2496" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="22"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="22"/> </properties> </object> <object id="62" name="To Room" type="warp" x="2112" y="1824" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="101"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="101"/> </properties> </object> <object id="63" name="To Room" type="warp" x="3360" y="1920" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="64" name="To Room" type="warp" x="1600" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="65" name="To Room" type="warp" x="1088" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="66" name="To Room" type="warp" x="864" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="67" name="To Room" type="warp" x="800" y="2528" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="68" name="To Room" type="warp" x="1280" y="3296" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="75"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="75"/> </properties> </object> <object id="69" name="To Room" type="warp" x="928" y="3648" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="70" name="To Room" type="warp" x="928" y="4320" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="48"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="48"/> </properties> </object> <object id="71" name="To Room" type="warp" x="1856" y="4096" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="72" name="To Room" type="warp" x="2688" y="3712" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="59"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="59"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="73" name="To Room" type="warp" x="4000" y="4000" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="74" name="To Room" type="warp" x="2656" y="3328" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="25"/> - <property name="dest_tile_y" value="49"/> + <property name="dest_x" value="25"/> + <property name="dest_y" value="49"/> </properties> </object> <object id="75" name="To Room" type="warp" x="2816" y="2784" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="35"/> - <property name="dest_tile_y" value="30"/> + <property name="dest_x" value="35"/> + <property name="dest_y" value="30"/> </properties> </object> <object id="76" name="To Room" type="warp" x="2528" y="2272" width="32" height="32"> <properties> <property name="dest_map" value="099-6"/> - <property name="dest_tile_x" value="121"/> - <property name="dest_tile_y" value="21"/> + <property name="dest_x" value="121"/> + <property name="dest_y" value="21"/> </properties> </object> </objectgroup> diff --git a/maps/099-2.tmx b/maps/099-2.tmx index 6d9cec2a..f58b7853 100644 --- a/maps/099-2.tmx +++ b/maps/099-2.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="21"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="21"> <properties> <property name="music" value=""/> <property name="name" value="Keshlam's Adventurer's Guild Quarters"/> @@ -1259,141 +1259,141 @@ <object id="1" name="To Hallway" type="warp" x="800" y="736" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="17"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="17"/> </properties> </object> <object id="2" name="To Hallway" type="warp" x="1888" y="704" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="77"/> - <property name="dest_tile_y" value="17"/> + <property name="dest_x" value="77"/> + <property name="dest_y" value="17"/> </properties> </object> <object id="3" name="To Hallway" type="warp" x="2880" y="704" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="105"/> - <property name="dest_tile_y" value="9"/> + <property name="dest_x" value="105"/> + <property name="dest_y" value="9"/> </properties> </object> <object id="4" name="To Hallway" type="warp" x="3872" y="704" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="137"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="137"/> </properties> </object> <object id="5" name="To Hallway" type="warp" x="800" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="20"/> - <property name="dest_tile_y" value="116"/> + <property name="dest_x" value="20"/> + <property name="dest_y" value="116"/> </properties> </object> <object id="6" name="To Hallway" type="warp" x="1888" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="86"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="86"/> </properties> </object> <object id="7" name="To Hallway" type="warp" x="2912" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="112"/> - <property name="dest_tile_y" value="127"/> + <property name="dest_x" value="112"/> + <property name="dest_y" value="127"/> </properties> </object> <object id="8" name="To Hallway" type="warp" x="3872" y="1568" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="115"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="115"/> </properties> </object> <object id="9" name="To Hallway" type="warp" x="800" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="73"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="73"/> </properties> </object> <object id="10" name="To Hallway" type="warp" x="1888" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="42"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="42"/> + <property name="dest_y" value="52"/> </properties> </object> <object id="11" name="To Hallway" type="warp" x="2912" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="12" name="To Hallway" type="warp" x="3872" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="15"/> - <property name="dest_tile_y" value="78"/> + <property name="dest_x" value="15"/> + <property name="dest_y" value="78"/> </properties> </object> <object id="13" name="To Hallway" type="warp" x="800" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="130"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="130"/> </properties> </object> <object id="14" name="To Hallway" type="warp" x="1920" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="113"/> - <property name="dest_tile_y" value="62"/> + <property name="dest_x" value="113"/> + <property name="dest_y" value="62"/> </properties> </object> <object id="15" name="To Hallway" type="warp" x="2912" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="131"/> - <property name="dest_tile_y" value="79"/> + <property name="dest_x" value="131"/> + <property name="dest_y" value="79"/> </properties> </object> <object id="16" name="To Hallway" type="warp" x="3872" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="72"/> - <property name="dest_tile_y" value="59"/> + <property name="dest_x" value="72"/> + <property name="dest_y" value="59"/> </properties> </object> <object id="17" name="To Hallway" type="warp" x="832" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="47"/> - <property name="dest_tile_y" value="93"/> + <property name="dest_x" value="47"/> + <property name="dest_y" value="93"/> </properties> </object> <object id="18" name="To Hallway" type="warp" x="1920" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="102"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="102"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="19" name="To Hallway" type="warp" x="2944" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="120"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="120"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="20" name="To Hallway" type="warp" x="3872" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="106"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="106"/> </properties> </object> </objectgroup> diff --git a/maps/099-3.tmx b/maps/099-3.tmx index 3be2b3b5..f146b876 100644 --- a/maps/099-3.tmx +++ b/maps/099-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="28"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="28"> <properties> <property name="music" value="ghoulish-fun.ogg"/> <property name="name" value="Keshlam's Adventurer's Guild Basement"/> @@ -1124,99 +1124,99 @@ <object id="1" name="To Hallway" type="warp" x="2304" y="800" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="119"/> - <property name="dest_tile_y" value="115"/> + <property name="dest_x" value="119"/> + <property name="dest_y" value="115"/> </properties> </object> <object id="2" name="To Hallway" type="warp" x="928" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="48"/> - <property name="dest_tile_y" value="17"/> + <property name="dest_x" value="48"/> + <property name="dest_y" value="17"/> </properties> </object> <object id="3" name="To Hallway" type="warp" x="1120" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="76"/> - <property name="dest_tile_y" value="26"/> + <property name="dest_x" value="76"/> + <property name="dest_y" value="26"/> </properties> </object> <object id="4" name="To Hallway" type="warp" x="1312" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="128"/> - <property name="dest_tile_y" value="18"/> + <property name="dest_x" value="128"/> + <property name="dest_y" value="18"/> </properties> </object> <object id="5" name="To Hallway" type="warp" x="1504" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="110"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="110"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="6" name="To Hallway" type="warp" x="1696" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="120"/> - <property name="dest_tile_y" value="79"/> + <property name="dest_x" value="120"/> + <property name="dest_y" value="79"/> </properties> </object> <object id="7" name="To Hallway" type="warp" x="1888" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="113"/> - <property name="dest_tile_y" value="98"/> + <property name="dest_x" value="113"/> + <property name="dest_y" value="98"/> </properties> </object> <object id="8" name="To Hallway" type="warp" x="2528" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="125"/> - <property name="dest_tile_y" value="98"/> + <property name="dest_x" value="125"/> + <property name="dest_y" value="98"/> </properties> </object> <object id="9" name="To Hallway" type="warp" x="2720" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="60"/> - <property name="dest_tile_y" value="93"/> + <property name="dest_x" value="60"/> + <property name="dest_y" value="93"/> </properties> </object> <object id="10" name="To Hallway" type="warp" x="2912" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="20"/> - <property name="dest_tile_y" value="55"/> + <property name="dest_x" value="20"/> + <property name="dest_y" value="55"/> </properties> </object> <object id="11" name="To Hallway" type="warp" x="3104" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="14"/> - <property name="dest_tile_y" value="55"/> + <property name="dest_x" value="14"/> + <property name="dest_y" value="55"/> </properties> </object> <object id="12" name="To Hallway" type="warp" x="3296" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="15"/> - <property name="dest_tile_y" value="68"/> + <property name="dest_x" value="15"/> + <property name="dest_y" value="68"/> </properties> </object> <object id="13" name="To Hallway" type="warp" x="3488" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="19"/> - <property name="dest_tile_y" value="94"/> + <property name="dest_x" value="19"/> + <property name="dest_y" value="94"/> </properties> </object> <object id="14" name="To Hallway" type="warp" x="3680" y="1952" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="57"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="57"/> + <property name="dest_y" value="52"/> </properties> </object> <object id="15" name="Object" type="switch" x="928" y="2208" width="32" height="32"/> diff --git a/maps/099-4.tmx b/maps/099-4.tmx index 0c70a379..229b2b6e 100644 --- a/maps/099-4.tmx +++ b/maps/099-4.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="1"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="1"> <properties> <property name="music" value="ghoulish-fun.ogg"/> <property name="name" value="?????"/> diff --git a/maps/099-5.tmx b/maps/099-5.tmx index a854ccad..1b32ece9 100644 --- a/maps/099-5.tmx +++ b/maps/099-5.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="1"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="1"> <properties> <property name="music" value="ghoulish-fun.ogg"/> <property name="name" value="?????"/> diff --git a/maps/099-6.tmx b/maps/099-6.tmx index f7e11b0c..ab31f04d 100644 --- a/maps/099-6.tmx +++ b/maps/099-6.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="26"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="26"> <properties> <property name="music" value="ominous3.ogg"/> <property name="name" value="Keshlam's Adventurer's Guild Quarters"/> @@ -1259,141 +1259,141 @@ <object id="1" name="To Hallway" type="warp" x="800" y="736" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="29"/> - <property name="dest_tile_y" value="17"/> + <property name="dest_x" value="29"/> + <property name="dest_y" value="17"/> </properties> </object> <object id="2" name="To Hallway" type="warp" x="1888" y="704" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="77"/> - <property name="dest_tile_y" value="17"/> + <property name="dest_x" value="77"/> + <property name="dest_y" value="17"/> </properties> </object> <object id="3" name="To Hallway" type="warp" x="2880" y="704" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="105"/> - <property name="dest_tile_y" value="9"/> + <property name="dest_x" value="105"/> + <property name="dest_y" value="9"/> </properties> </object> <object id="4" name="To Hallway" type="warp" x="3872" y="704" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="91"/> - <property name="dest_tile_y" value="137"/> + <property name="dest_x" value="91"/> + <property name="dest_y" value="137"/> </properties> </object> <object id="5" name="To Hallway" type="warp" x="800" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="20"/> - <property name="dest_tile_y" value="116"/> + <property name="dest_x" value="20"/> + <property name="dest_y" value="116"/> </properties> </object> <object id="6" name="To Hallway" type="warp" x="1889" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="86"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="86"/> </properties> </object> <object id="7" name="To Hallway" type="warp" x="2912" y="1600" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="112"/> - <property name="dest_tile_y" value="127"/> + <property name="dest_x" value="112"/> + <property name="dest_y" value="127"/> </properties> </object> <object id="8" name="To Hallway" type="warp" x="3872" y="1568" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="115"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="115"/> </properties> </object> <object id="9" name="To Hallway" type="warp" x="800" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="64"/> - <property name="dest_tile_y" value="73"/> + <property name="dest_x" value="64"/> + <property name="dest_y" value="73"/> </properties> </object> <object id="10" name="To Hallway" type="warp" x="1888" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="42"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="42"/> + <property name="dest_y" value="52"/> </properties> </object> <object id="11" name="To Hallway" type="warp" x="2912" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="92"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="92"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="12" name="To Hallway" type="warp" x="3872" y="2432" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="34"/> - <property name="dest_tile_y" value="52"/> + <property name="dest_x" value="34"/> + <property name="dest_y" value="52"/> </properties> </object> <object id="13" name="To Hallway" type="warp" x="800" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="49"/> - <property name="dest_tile_y" value="130"/> + <property name="dest_x" value="49"/> + <property name="dest_y" value="130"/> </properties> </object> <object id="14" name="To Hallway" type="warp" x="1920" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="113"/> - <property name="dest_tile_y" value="62"/> + <property name="dest_x" value="113"/> + <property name="dest_y" value="62"/> </properties> </object> <object id="15" name="To Hallway" type="warp" x="2912" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="131"/> - <property name="dest_tile_y" value="79"/> + <property name="dest_x" value="131"/> + <property name="dest_y" value="79"/> </properties> </object> <object id="16" name="To Hallway" type="warp" x="3872" y="3264" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="72"/> - <property name="dest_tile_y" value="59"/> + <property name="dest_x" value="72"/> + <property name="dest_y" value="59"/> </properties> </object> <object id="17" name="To Hallway" type="warp" x="833" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="47"/> - <property name="dest_tile_y" value="93"/> + <property name="dest_x" value="47"/> + <property name="dest_y" value="93"/> </properties> </object> <object id="18" name="To Hallway" type="warp" x="1920" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="102"/> - <property name="dest_tile_y" value="25"/> + <property name="dest_x" value="102"/> + <property name="dest_y" value="25"/> </properties> </object> <object id="19" name="To Hallway" type="warp" x="2944" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="120"/> - <property name="dest_tile_y" value="45"/> + <property name="dest_x" value="120"/> + <property name="dest_y" value="45"/> </properties> </object> <object id="20" name="To Hallway" type="warp" x="3872" y="4256" width="32" height="32"> <properties> <property name="dest_map" value="099-1"/> - <property name="dest_tile_x" value="97"/> - <property name="dest_tile_y" value="106"/> + <property name="dest_x" value="97"/> + <property name="dest_y" value="106"/> </properties> </object> <object id="21" name="Object" type="switch" x="800" y="544" width="32" height="32"/> diff --git a/maps/099-7.tmx b/maps/099-7.tmx index 9e03ad3e..ce6aca02 100644 --- a/maps/099-7.tmx +++ b/maps/099-7.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.5" tiledversion="1.7.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="180" height="170" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="17"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="180" height="170" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="17"> <properties> <property name="music" value="thunderstorm.ogg"/> <property name="name" value="Ruined Swamps"/> @@ -142,18 +142,18 @@ <tileset firstgid="1353" name="woodland_x2" tilewidth="64" tileheight="64" tilecount="16" columns="8"> <image source="../graphics/tiles/woodland_x2.png" width="512" height="128"/> </tileset> - <tileset firstgid="1369" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> - <image source="../graphics/tiles/collision.png" width="96" height="96"/> + <tileset firstgid="1369" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> + <image source="../graphics/tiles/collision.png" width="64" height="32"/> </tileset> - <tileset firstgid="1378" source="../tilesets/woodland_x2.tsx"/> - <tileset firstgid="1410" name="woodland_ground2" tilewidth="32" tileheight="32" tilecount="256" columns="16"> + <tileset firstgid="1371" source="../tilesets/woodland_x2.tsx"/> + <tileset firstgid="1403" name="woodland_ground2" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tiles/woodland_ground2.png" width="512" height="512"/> </tileset> - <tileset firstgid="1666" source="../tilesets/barbarians_outdoor.tsx"/> - <tileset firstgid="1669" source="../tilesets/woodland_village_x2.tsx"/> - <tileset firstgid="1685" source="../tilesets/woodland_village.tsx"/> - <tileset firstgid="1941" source="../tilesets/woodland_x3.tsx"/> - <tileset firstgid="1973" source="../tilesets/evil_obelisk.tsx"/> + <tileset firstgid="1659" source="../tilesets/barbarians_outdoor.tsx"/> + <tileset firstgid="1662" source="../tilesets/woodland_village_x2.tsx"/> + <tileset firstgid="1678" source="../tilesets/woodland_village.tsx"/> + <tileset firstgid="1934" source="../tilesets/woodland_x3.tsx"/> + <tileset firstgid="1966" source="../tilesets/evil_obelisk.tsx"/> <layer id="1" name="Ground" width="180" height="170"> <data encoding="csv"> 60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,75,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,75,60,60,60,60,60,60,60,60,60,60,75,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,75,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,92, @@ -189,9 +189,9 @@ 60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,394,394,394,394,394,394,394,394,394,394,394,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, 60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,10,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,394,394,394,394,394,394,394,394,394,23,23,23,23,23,75,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,91,60,60,60,60, 60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,91,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,394,394,394,394,394,394,394,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, -60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,92,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,1592,394,394,394,394,394,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, -60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,1590,542,542,542,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, -60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,1606,558,558,558,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, +60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,92,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,1585,394,394,394,394,394,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, +60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,1583,542,542,542,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, +60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,1599,558,558,558,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, 60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,91,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,92,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60, 60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,60,60,60,60,60,60,92,60,60,60,60,60,60, 60,60,91,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,91,91,23,23,11,12,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,23,23,23,23,75,23,23,23,23,23,23,23,23,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,60,60,60,60,60,60,60,75,60,60,60,60,60,60,60,60,60,60,60,60, @@ -347,7 +347,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,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -357,30 +357,30 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1571,1574,1574,1574,1574,1574,1574,1574,1574,1574,1574,1574,1574,1574,1577,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1586,0,0,0,0,0,0,0,0,0,0,0,0,0,1594,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1602,0,0,0,0,0,0,0,0,0,0,0,0,0,1610,0,1405,0,0,262,314,287,0,0,0,0,0,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1618,1592,0,0,0,1936,0,0,0,0,0,0,0,1588,1626,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1634,1608,1592,0,0,0,0,0,0,0,0,0,1588,1604,1642,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,314,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1650,1624,1608,1592,0,0,0,1666,0,0,604,1588,1604,1620,1658,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,1640,1624,1608,1525,0,0,0,0,608,1588,1604,1620,1636,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1640,1624,1625,1051,0,0,0,1590,1619,1620,1636,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,0,0,0,0,1640,1606,1051,0,0,0,1606,1635,1636,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,314,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1657,1622,1622,1622,1622,1622,1651,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1564,1567,1567,1567,1567,1567,1567,1567,1567,1567,1567,1567,1567,1567,1570,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1579,0,0,0,0,0,0,0,0,0,0,0,0,0,1587,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1595,0,0,0,0,0,0,0,0,0,0,0,0,0,1603,0,1398,0,0,262,314,287,0,0,0,0,0,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1611,1585,0,0,0,1929,0,0,0,0,0,0,0,1581,1619,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1627,1601,1585,0,0,0,0,0,0,0,0,0,1581,1597,1635,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,314,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1643,1617,1601,1585,0,0,0,1659,0,0,604,1581,1597,1613,1651,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,1633,1617,1601,1518,0,0,0,0,608,1581,1597,1613,1629,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1633,1617,1618,1051,0,0,0,1583,1612,1613,1629,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,1398,0,0,0,0,1633,1599,1051,0,0,0,1599,1628,1629,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,314,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1650,1615,1615,1615,1615,1615,1644,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,39,39,39,39,39,39,39,39,26,0,0,493,0,0,0,76,0,0,0,0,0,0,0,25,39,39,39,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,314,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,39,39,40,0,0,0,0,0,0,0,0,38,39,26,0,0,0,0,0,0,0,0,0,0,25,39,40,0,0,0,0,86,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,26,0,0,0,0,0,0,0,25,40,0,0,0,0,0,0,0,86,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,26,23,25,39,39,39,40,0,0,0,0,0,0,0,0,0,86,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,39,39,39,39,39,39,39,39,39,39,39,39,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,39,26,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,26,23,25,39,39,39,40,0,0,0,0,0,0,0,0,0,86,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,1398,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,39,39,39,39,39,39,39,39,39,39,39,39,39,39,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,39,26,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,474,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,44,0,0,0,25,39,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,25,39,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,476,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -389,10 +389,10 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,0,0,0,0,0,0,0,25,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,87,26,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,25,40,0,0,0,0,0,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,314,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,314,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,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,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,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,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,41,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,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,475,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -400,25 +400,25 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,25,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,44,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,41,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,1405,1405,0,0,0,0,0,0,25,39,26,41,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,1405,0,0,0,73,39,88,0,38,26,0,41,8,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,41,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,1398,1398,0,0,0,0,0,0,25,39,26,41,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,1398,0,0,0,73,39,88,0,38,26,0,41,8,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,91,0,0,0,0,25,39,88,0,0,0,0,38,26,0,41,8,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,476,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,44,0,0,0,0,0,0,0,0,0,73,88,0,0,0,0,0,0,0,38,26,0,41,7,7,7,8,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,474,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,88,0,0,0,0,0,0,0,0,0,38,39,39,26,0,0,41,8,0,0,0,0,0,0,0,91,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,604,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,38,26,0,0,41,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,88,0,0,0,0,0,0,0,0,0,38,39,39,26,0,0,41,8,0,0,0,0,0,0,0,91,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,604,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,38,26,0,0,41,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,39,39,39,39,26,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,493,0,0,0,27,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,91,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,604,0,0,0,0,0,0,43,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,608,608,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,604,476,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,39,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,569,92,569,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,39,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,569,92,569,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,39,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,91,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,91,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,91,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,7,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,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1036,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,7,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,1398,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1036,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,0,0,0,0,0,0,0,479,479,0,0,0,0,0,0,0,0,1066,477,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,92,569,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,8,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,474,0,0,0,0,0,0,0,0,0,1068,1034,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -427,12 +427,12 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,75,91,75,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,608,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,604,1081,0,0,0,0,0,0,0,0,0,0,0,0,494,92,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,0,0,89,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,0,0,41,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,42,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,8,0,0,0,0,0,6,7,0,7,8,0,0,6,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,6,7,42,0,91,0,41,7,7,42,0,0,0,73,0,0,26,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,8,0,6,42,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,7,42,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,1398,0,0,89,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,1398,0,0,41,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,42,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,8,0,0,0,0,0,6,7,0,7,8,0,0,6,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,6,7,42,0,91,0,41,7,7,42,0,0,0,73,0,0,26,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,8,0,6,42,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,7,42,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,476,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -441,7 +441,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,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,475,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,25,39,26,0,0,0,0,0,0,0,0,0,25,39,0,0,0,0,569,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,44,0,0,0,40,0,86,39,39,39,26,0,0,0,0,25,88,0,0,0,0,0,569,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -451,21 +451,21 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,479,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,91,92,569,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,569,92,91,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,314,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,314,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,314,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,294,314,314,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,314,314,314,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,314,314,314,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,275,314,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,272,314,274,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,272,314,274,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,272,314,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,272,314,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,262,263,264,0,0,272,314,274,0,265,266,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,476,0,0,0,0,0,0,0,0,0,0,0,0,0,272,273,274,0,0,275,276,277,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,476,0,0,0,0,0,0,0,0,0,0,0,0,0,272,273,274,0,0,275,276,277,0,275,276,277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,282,283,284,0,0,285,286,287,0,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -537,14 +537,14 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,493,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1542,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,262,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,272,274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,282,284,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1540,0,0,0,0,0,1389,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1533,0,0,0,0,0,1382,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -683,35 +683,35 @@ 0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,1018,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,1019,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,1019,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1018,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,3,0,0,1019,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1018,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,3,0,0,1019,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,3,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,1018,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,1018,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,1018,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,1024,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,1018,0,0,0,0,0,3,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0, -0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,3,0,0,0,0,0,0,0,0,0,1385,1386,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0, +0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,3,0,0,0,0,0,0,0,0,0,1378,1379,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,1019,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,1019,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0, 0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,1018,0,0,0,1018,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,1017,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,1018,0,0,0,0,0,0,1018,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,3,0,0,0,1018,0,0,0,1018,0,0,0,1018,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1018,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,1019,0,0,3,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,1019,0,0,3,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,1018,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,3,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,1018,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,3,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,1018,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1388,1389,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,1018,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0, 0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,2,0,0,0,0,0,1358,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1358,0,0,0,1684,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1358,0,0,0,1677,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0, -0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,1358,0,0,0,1358,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,1018,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,1389,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1388,0,1389,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1385,1386,0,0, +0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,1358,0,0,0,1358,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,1018,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,1382,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1381,0,1382,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1378,1379,0,0, 0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,3,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -721,36 +721,36 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,3,0,0,0,0,1971,1972,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1397,1398,0,2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,3,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1,0,0,1,0,0,1032,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,3,0,0, +0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,3,0,0,0,0,1964,1965,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1390,1391,0,2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,3,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1,0,0,1,0,0,1032,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,3,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1032,0,0,0,0,1032,0,3,0,0,3,0,0,1,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1388,1389,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1032,0,0,0,0,1032,0,3,0,0,3,0,0,1,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1381,1382,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,1018,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,1019,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,1388,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,1389,0,0,0,0,0,0,0,3,0,0,0,0,1032,0,3,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1388,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,3,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,1019,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,1381,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,1382,0,0,0,0,0,0,0,3,0,0,0,0,1032,0,3,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,3,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,3,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,1,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,1026,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1389,0,0,0,0,3,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,1018,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1382,0,0,0,0,3,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,1018,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,3,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,3,0,0, -0,0,0,0,0,1017,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1353,1390,1391,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,1395,1396,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0, +0,0,0,0,0,1017,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1353,1383,1384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,1388,1389,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,1,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1019,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0, 0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,1017,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,1017,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,1018,0,0,0,0,0,0,1018,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -766,7 +766,7 @@ 0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,1017,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,3,0,0,1032,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0, @@ -780,7 +780,7 @@ 0,0,0,1018,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,3,0,0,0,2,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,3,0,0,1018,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,1019,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,1018,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -790,14 +790,14 @@ 0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1024,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,1032,0,0,3,0,0,0,0,0,0,1024,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,1019,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,91,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,3,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,1024,0,1032,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,1018,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,1024,0,1032,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,1018,0,0, 0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1027,0,0,0,0,0,0,2,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -808,7 +808,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,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,3,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,1017,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,1018,0,0,0,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,3,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,2,0,0,3,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,1017,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,3,0,0,0,0,0,2,0,0,1399,1400,0,0,0,0,0,0,1018,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,1017,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,3,0,0,0,0,0,2,0,0,1392,1393,0,0,0,0,0,0,1018,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,1,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,1017,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,1017,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,3,0,0,0,0,0,0,1,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -817,7 +817,7 @@ 0,0,0,0,1019,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,3,0,0,0,0,1019,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1017,0,0,0,0,1019,0,0,0,0,0, 0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,3,0,0,0,0,1018,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,1017,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,1018,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 1018,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -833,16 +833,16 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,1019,0,0,0,0,0,0,0,0,1017,0,0,1018,0,0,0,0,0,0,0,0,1018,0,0,0,3,0,0,0,0,1019,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,1018,0,0,0,0,1019,0,1018,0,0,0,0,0,3,0,0,1018,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,1018,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,1017,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,1018,0,0,0,1019,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,1017,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,1018,0,0,0,1019,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,3,0,0,0,0,0,0,1385,1386,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,1385,1386,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,1385,1386,0,0,1018,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0, +0,0,0,0,0,3,0,0,0,0,0,0,1378,1379,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,1378,1379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,1378,1379,0,0,1018,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0, 0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,1018,0,0,0,1019,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,0,3,0,0,0,0,0,0,1018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1032,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1019,0,0,0,0,0,3,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,1017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,1019,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1018,0,0,0,0,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/099-8.tmx b/maps/099-8.tmx index fa03f42f..be1fcc3e 100644 --- a/maps/099-8.tmx +++ b/maps/099-8.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="403" height="403" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="1"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="403" height="403" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="1"> <properties> <property name="music" value="despair.ogg"/> <property name="name" value="Keshlam's Maze"/> diff --git a/maps/botcheck.tmx b/maps/botcheck.tmx index f9e83669..aa192e53 100644 --- a/maps/botcheck.tmx +++ b/maps/botcheck.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" orientation="orthogonal" renderorder="right-down" width="75" height="75" tilewidth="32" tileheight="32" nextobjectid="1"> +<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="75" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="1"> <properties> <property name="music" value="dimonds-cove.ogg"/> <property name="name" value="Botcheck Area"/> @@ -7,7 +7,7 @@ <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/cave.tsx"/> <tileset firstgid="131" source="../tilesets/arena.tsx"/> - <layer name="Ground1" width="75" height="75"> + <layer id="1" name="Ground1" width="75" height="75"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, @@ -86,7 +86,7 @@ 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 </data> </layer> - <layer name="Fringe" width="75" height="75"> + <layer id="2" name="Fringe" width="75" height="75"> <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, @@ -165,7 +165,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 name="Over1" width="75" height="75"> + <layer id="3" name="Over1" width="75" height="75"> <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, @@ -244,7 +244,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 name="Collision" width="75" height="75"> + <layer id="4" name="Collision" width="75" height="75"> <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, diff --git a/mods b/mods new file mode 160000 +Subproject aa2d7c26ae696ee3952e9217a5370b7ae44957d @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Authors: 4144 -Copyright (C) 2017 Evol Online --> +<!-- Copyright (C) 2023 The Mana World --> <mods> +<mod name="Outdated" description="Reverts changes to how monsters.xml work, to a pre-mod era" help="COPYING" localdir="mods/outdated/" /> </mods> diff --git a/monsters.xml b/monsters.xml index 9d4786a7..9ab5d143 100644 --- a/monsters.xml +++ b/monsters.xml @@ -1,7 +1,1606 @@ <?xml version="1.0"?> <monsters offset="0"> - <include name="monsters/_include.xml"/> + <monster id="1002" name="Maggot" targetCursor="small"> + <sprite>monsters/maggot.xml</sprite> + <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> + <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> + <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> + <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> + </monster> + + <monster id="1003" name="Scorpion"> + <sprite>monsters/scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + <sound event="die">monsters/spider/spider-die1.ogg</sound> + </monster> + + <monster id="1004" name="Red Scorpion"> + <sprite>monsters/scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + <sound event="die">monsters/spider/spider-die1.ogg</sound> + </monster> + + <monster id="1005" name="Green Slime"> + <sprite>monsters/slime.xml|#72982c,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1006" name="Giant Maggot" targetCursor="large"> + <sprite>monsters/maggot-giant.xml</sprite> + <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> + <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> + <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> + <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> + </monster> + + <monster id="1007" name="Yellow Slime"> + <sprite>monsters/slime.xml|#b47f00,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1008" name="Red Slime"> + <sprite>monsters/slime.xml|#7e0000,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1009" name="Black Scorpion"> + <sprite>monsters/scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + <sound event="die">monsters/spider/spider-die1.ogg</sound> + </monster> + + <monster id="1010" name="Snake"> + <sprite>monsters/snake.xml|#664d28,a6673a,dbbc86,ffffff</sprite> + </monster> + + <monster id="1011" name="Fire Goblin"> + <sprite>monsters/goblin-fire.xml</sprite> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> + <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> + <attack id="1" effect-id="400"/> + </monster> + + <monster id="1012" name="Spider"> + <sprite>monsters/spider.xml|#1a160f,4A7A93,AAC5D2,ffffff;#FF6666</sprite> + <sound event="hit">monsters/spider/spider-hit1.ogg</sound> + <sound event="hit">monsters/spider/spider-hit2.ogg</sound> + <sound event="hit">monsters/spider/spider-hit3.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + <sound event="die">monsters/spider/spider-die1.ogg</sound> + </monster> + + <monster id="1013" name="Evil Mushroom"> + <sprite>monsters/accessories/mushroom-base1.xml|#B38336,FFF5CC</sprite> + <sprite>monsters/accessories/mushroom-base1-arms1.xml|#B38336,FFF5CC</sprite> + <sprite>monsters/accessories/mushroom-base1-face2.xml|#732222,BF3939,FF9E9E,FFD9D9,FFFFFF;#B38336,FFF5CC</sprite> + <sprite>monsters/accessories/mushroom-base1-cap1.xml|#732222,BF3939,FF9E9E,FFD9D9,FFFFFF;#B38336,FFF5CC</sprite> + <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> + <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> + <sound event="die">monsters/shroom/shroom-die1.ogg</sound> + </monster> + + <monster id="1014" name="Pink Flower"> + <sprite>monsters/flower.xml|#ee748d,ffd8ce;#f6ffbd;#23285f</sprite> + <sound event="hit">monsters/flower/flower-hit1.ogg</sound> + <sound event="hit">monsters/flower/flower-hit2.ogg</sound> + <sound event="miss">monsters/flower/flower-miss1.ogg</sound> + </monster> + + <monster id="1015" name="Santa Slime"> + <sprite>monsters/slime.xml|#545166,66A9CD,C2F7FA</sprite> + <sprite>monsters/accessories/slime-santa.xml</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1016" name="Rudolph Slime"> + <sprite>monsters/slime.xml|#9092B9,9DB4D4,F8F9FA</sprite> + <sprite>monsters/accessories/slime-rudolph.xml</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1017" name="Bat"> + <sprite>monsters/bat.xml</sprite> + <sound event="die">monsters/bat/bat-dying1.ogg</sound> + <sound event="hit">monsters/bat/bat-hit1.ogg</sound> + </monster> + + <monster id="1018" name="Pinkie" targetCursor="small"> + <sprite>monsters/pinkie.xml</sprite> + <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound> + <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound> + </monster> + + <monster id="1019" name="Spiky Mushroom"> + <sprite>monsters/accessories/mushroom-base1.xml|#B37410,FFF5CC</sprite> + <sprite>monsters/accessories/mushroom-base1-face1.xml|#730A73,BF31C0,FF9EFF,FFD9FF,FFFFFF;#7B4E07,FFF5CC</sprite> + <sprite>monsters/accessories/mushroom-base1-cap1.xml|#730A73,BF31C0,FF9EFF,FFD9FF,FFFFFF;#B36E00,FFF5CC</sprite> + <sprite>monsters/accessories/mushroom-base1-cap1-spikes.xml|#CC9C3D,FFFFCC</sprite> + <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> + <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> + <sound event="die">monsters/shroom/shroom-die1.ogg</sound> + </monster> + + <monster id="1020" name="Fluffy"> + <sprite>monsters/fluffy.xml</sprite> + <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound> + <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound> + <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound> + <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound> + <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound> + </monster> + + <monster id="1021" name="Cave Snake"> + <sprite>monsters/snake-cave.xml</sprite> + <sound event="hit">monsters/cavesnake/cavesnake-hit1.ogg</sound> + </monster> + + <monster id="1022" name="Jack O"> + <sprite>monsters/ghost-pumpkin.xml</sprite> + </monster> + + <monster id="1023" name="Fire Skull"> + <sprite>monsters/skull-fire.xml</sprite> + </monster> + + <monster id="1024" name="Poison Skull"> + <sprite>monsters/skull-poison.xml</sprite> + </monster> + + <monster id="1025" name="Log Head"> + <sprite>monsters/logmonster.xml</sprite> + <sound event="hit">monsters/loghead/loghead-hit1.ogg</sound> + <sound event="hurt">monsters/loghead/loghead-hurt1.ogg</sound> + <sound event="hurt">monsters/loghead/loghead-hurt2.ogg</sound> + <sound event="hurt">monsters/loghead/loghead-hurt3.ogg</sound> + <sound event="hurt">monsters/loghead/loghead-hurt4.ogg</sound> + <sound event="hurt">monsters/loghead/loghead-hurt5.ogg</sound> + <sound event="die">monsters/loghead/loghead-die1.ogg</sound> + </monster> + + <monster id="1026" name="Mountain Snake"> + <sprite>monsters/snake.xml|#585b39,a67c5d,dbc9a9,ffffff</sprite> + </monster> + + <monster id="1027" name="Easter Fluffy"> + <sprite>monsters/fluffy.xml</sprite> + <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound> + <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound> + <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound> + <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound> + <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound> + </monster> + + <monster id="1028" name="Mouboo"> + <sprite>monsters/mouboo.xml</sprite> + </monster> + + <monster id="1029" name="Mauve Plant"> + <sprite>monsters/plant.xml|#e0b0ff</sprite> + </monster> + + <monster id="1030" name="Cobalt Plant"> + <sprite>monsters/plant.xml|#0047ab</sprite> + </monster> + + <monster id="1031" name="Gamboge Plant"> + <sprite>monsters/plant.xml|#ef9b0f</sprite> + </monster> + + <monster id="1032" name="Alizarin Plant"> + <sprite>monsters/plant.xml|#e32636</sprite> + </monster> + + <monster id="1033" name="Sea Slime"> + <sprite>monsters/slime.xml|#4ca1a0,ffffff</sprite> + <sprite>monsters/accessories/slime-seajelly.xml|#4Ca16e,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1034" name="Grass Snake"> + <sprite>monsters/snake.xml|#205839,60a65d,80dba9,ffffff</sprite> + </monster> + + <monster id="1035" name="Silkworm"> + <sprite>monsters/silkworm.xml|#807d20,e0dac0;#c0a830</sprite> + </monster> + + <monster id="1036" name="Zombie"> + <sprite>monsters/zombie.xml</sprite> + <sound event="move">monsters/zombie/zombie-move1.ogg</sound> + <sound event="move">monsters/zombie/zombie-move2.ogg</sound> + <sound event="hit">monsters/zombie/zombie-hit1.ogg</sound> + <sound event="hit">monsters/zombie/zombie-hit2.ogg</sound> + <sound event="miss">monsters/zombie/zombie-miss1.ogg</sound> + <sound event="die">monsters/zombie/zombie-dying1.ogg</sound> + </monster> + + <monster id="1037" name="Clover Patch"> + <sprite>monsters/clover.xml</sprite> + </monster> + + <monster id="1038" name="Squirrel"> + <sprite>monsters/squirrel.xml|#dfae76</sprite> + <sound event="hurt">monsters/squirrel/squirrel-hurt1.ogg</sound> + <sound event="hurt">monsters/squirrel/squirrel-hurt2.ogg</sound> + <sound event="die">monsters/squirrel/squirrel-die1.ogg</sound> + <sound event="die">monsters/squirrel/squirrel-die2.ogg</sound> + </monster> + + <monster id="1039" name="Fire Lizard"> + <sprite>monsters/lizard.xml|#673132,923F42,CD5961,E163A4,ffffff</sprite> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> + <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> + <attack id="1" effect-id="401"/> + </monster> + + <monster id="1040" name="Wisp"> + <sprite>monsters/wisp.xml|#aadd44,ffff66</sprite> + <particlefx>graphics/particles/wisp.particle.xml</particlefx> + </monster> + + <monster id="1041" name="Snail"> + <sprite>monsters/snail.xml|#FDC689;#E0A6E3;#E0A6E3;#F06EAA;#C69C6D;#A9FF02</sprite> + <particlefx>graphics/particles/monster-snail-trail.particle.xml</particlefx> + <sound event="hit">monsters/snail/snail-hit1.ogg</sound> + <sound event="hurt">monsters/snail/snail-hurt1.ogg</sound> + <sound event="hurt">monsters/snail/snail-hurt1.ogg</sound> + <sound event="die">monsters/snail/snail-die1.ogg</sound> + </monster> + + <monster id="1042" name="Spectre"> + <sprite>monsters/wisp.xml|#ff77dd,dd77ff</sprite> + <particlefx>graphics/particles/spectre.particle.xml</particlefx> + </monster> + + <monster id="1043" name="Skeleton"> + <sprite>monsters/skeleton.xml|#ffe8bf</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + </monster> + + <monster id="1044" name="Lady Skeleton"> + <sprite>monsters/skeleton.xml|#ffe8bf</sprite> + <sprite>monsters/accessories/hairstyle08.xml|#ffe8bf</sprite> + <sound event="die">monsters/skeleton_lady/ladyskel-die1.ogg</sound> + <sound event="die">monsters/skeleton_lady/ladyskel-die2.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton_lady/ladyskel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton_lady/ladyskel-miss1.ogg</sound> + </monster> + + <monster id="1045" name="Fallen"> + <sprite>monsters/skeleton.xml|#ffe8bf</sprite> + <sprite>equipment/legs/chaps.xml</sprite> + <sprite>equipment/chest/warlordplate.xml</sprite> + <sprite>equipment/head/warlordhelm.xml</sprite> + <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="die">monsters/fallen/fallen-die1.ogg</sound> + <sound event="die">monsters/fallen/fallen-die2.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + </monster> + + <monster id="1046" name="Tame Scorpion"> + <sprite>monsters/scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + </monster> + + <monster id="1047" name="Poltergeist"> + <sprite>monsters/wisp.xml|#77ffdd,77ddff</sprite> + <particlefx>graphics/particles/polter.particle.xml</particlefx> + </monster> + + <monster id="1048" name="Duck" targetCursor="small"> + <sprite>monsters/duck.xml</sprite> + </monster> + + <monster id="1049" name="Bee" targetCursor="small"> + <sprite>monsters/bee.xml</sprite> + <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite> + <sound event="die">monsters/bee/bee-die1.ogg</sound> + <sound event="hit">monsters/bee/bee-hit1.ogg</sound> + <sound event="miss">monsters/bee/bee-miss1.ogg</sound> + <sound event="move">monsters/bee/bee-move1.ogg</sound> + </monster> + + <monster id="1050" name="House Maggot" targetCursor="small"> + <sprite>monsters/cave-maggot.xml|#4d422d,826242,d8c282,ffffff</sprite> + <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> + <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> + <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> --> + <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> + </monster> + + <!-- Monster ID 1051 is free --> + <!-- Monster ID 1052 is free --> + <!-- Monster ID 1053 is free --> + <monster id="1054" name="Troll"> + <sprite>monsters/troll.xml|#FFDEC2;#FF4D4D;#FF99FF;#FFC88A</sprite> + <attack id="1" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" action="attack"/> + <sound event="hit">env/flame.ogg</sound> + <sound event="miss">env/flame.ogg</sound> + </monster> + + <monster id="1055" name="Butterfly" targetCursor="small"> + <sprite>monsters/butterfly.xml|#660000,FF3300,FFCC99,FFCCCC</sprite> + <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite> + </monster> + + <monster id="1056" name="Cave Maggot" targetCursor="small"> + <sprite>monsters/cave-maggot.xml|</sprite> + <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> + <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> + <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> --> + <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> + </monster> + + <monster id="1057" name="Angry Scorpion"> + <sprite>monsters/scorpion.xml|#800000,ffffff</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + </monster> + + <monster id="1058" name="Ice Goblin"> + <sprite>monsters/goblin-ice.xml</sprite> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> + <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> + </monster> + + <monster id="1059" name="Giant Cave Maggot" targetCursor="large"> + <sprite>monsters/cave-maggot-giant.xml|#565051,ffffff</sprite> + <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> + <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> + <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> + <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> + </monster> + + <monster id="1060" name="Archant"> + <sprite>monsters/archant.xml</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + </monster> + + <monster id="1061" name="Moggun"> + <sprite>monsters/moggun.xml</sprite> + </monster> + + <monster id="1062" name="Terranite"> + <sprite>monsters/terranite.xml</sprite> + <sound event="die">monsters/terranite/terra-die1.ogg</sound> + <sound event="hit">monsters/terranite/terra-hit1.ogg</sound> + <sound event="hit">monsters/terranite/terra-hit2.ogg</sound> + <sound event="hit">monsters/terranite/terra-hit3.ogg</sound> + <sound event="hurt">monsters/terranite/terra-hurt1.ogg</sound> + <sound event="hurt">monsters/terranite/terra-hurt2.ogg</sound> + <sound event="hurt">monsters/terranite/terra-hurt3.ogg</sound> + <sound event="miss">monsters/terranite/terra-miss1.ogg</sound> + <sound event="move">monsters/terranite/terra-move1.ogg</sound> + </monster> + + <monster id="1063" name="Pumpkin"> + <sprite>monsters/pumpkin.xml</sprite> + </monster> + + <monster id="1064" name="Bandit"> + <sprite>monsters/bandit.xml</sprite> + <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + </monster> + + <monster id="1065" name="Bandit Lord"> + <sprite>monsters/bandit-lord.xml</sprite> + <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/> + </monster> + + <monster id="1066" name="Vampire Bat"> + <sprite>monsters/vampire-bat.xml</sprite> + <sound event="die">monsters/bat/bat-dying1.ogg</sound> + <sound event="hit">monsters/bat/bat-hit1.ogg</sound> + </monster> + + <monster id="1067" name="Reaper"> + <sprite>monsters/reaper.xml</sprite> + <sprite>monsters/accessories/reaper-shadow.xml</sprite> + <particlefx>graphics/particles/monster-reaper.particle.xml</particlefx> + <sound event="die">monsters/reaper/reaper-die1.ogg</sound> + <sound event="hit">monsters/reaper/reaper-hit1.ogg</sound> + <sound event="hurt">monsters/reaper/reaper-hurt1.ogg</sound> + <sound event="move">monsters/reaper/reaper-move1.ogg</sound> + <attack id="1" critical-hit-effect-id="32" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/> + </monster> + + <monster id="1068" name="Reaper"> + <sprite>monsters/reaper.xml</sprite> + <sprite>monsters/accessories/reaper-shadow.xml</sprite> + <particlefx>graphics/particles/monster-reaper.particle.xml</particlefx> + <sound event="die">monsters/reaper/reaper-die1.ogg</sound> + <sound event="hit">monsters/reaper/reaper-hit1.ogg</sound> + <sound event="hurt">monsters/reaper/reaper-hurt1.ogg</sound> + <sound event="move">monsters/reaper/reaper-move1.ogg</sound> + <attack id="1" critical-hit-effect-id="32" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/> + </monster> + + <monster id="1069" name="Flying Scythe" targetCursor="large"> + <sprite>monsters/spinning-scythe.xml</sprite> + <sprite>monsters/accessories/scythe-shadow.xml</sprite> + <sound event="die">monsters/scythe/scythe-die1.ogg</sound> + <sound event="hit">weapons/other/scythe/scythe-hit1.ogg</sound> + <sound event="hit">weapons/other/scythe/scythe-hit2.ogg</sound> + <sound event="hit">weapons/other/scythe/scythe-hit3.ogg</sound> + <sound event="move">monsters/scythe/scythe-move1.ogg</sound> + <sound event="move">monsters/scythe/scythe-move2.ogg</sound> + <sound event="move">monsters/scythe/scythe-move3.ogg</sound> + <sound event="sit">monsters/scythe/scythe-move1.ogg</sound> + <sound event="sit">monsters/scythe/scythe-move2.ogg</sound> + <sound event="sit">monsters/scythe/scythe-move3.ogg</sound> + </monster> + + <monster id="1070" name="Ball Lightning" targetCursor="small"> + <sprite>monsters/ball-lightning.xml</sprite> + <sprite>monsters/accessories/ball-lightning-shadow.xml</sprite> + <particlefx>graphics/particles/monster-ball-lightning.particle.xml</particlefx> + <sound event="move">monsters/ball_lightning/ball_lighning-move1.ogg</sound> + <sound event="die">env/zap.ogg</sound> + <attack id="1" hit-effect-id="23" miss-effect-id="23" action="attack"/> + </monster> + + <monster id="1071" name="Ice Element"> + <sprite>monsters/element-ball.xml|#5e929d,a2d8e3,ffffff</sprite> + </monster> + + <monster id="1072" name="Yeti"> + <sprite>monsters/yeti.xml</sprite> + <sound event="die">monsters/yeti/yeti-die1.ogg</sound> + <sound event="hit">monsters/yeti/yeti-hit1.ogg</sound> + <sound event="hit">monsters/yeti/yeti-hit2.ogg</sound> + <sound event="hit">monsters/yeti/yeti-hit3.ogg</sound> + <sound event="hit">monsters/yeti/yeti-hit4.ogg</sound> + <sound event="hurt">monsters/yeti/yeti-hurt1.ogg</sound> + <sound event="hurt">monsters/yeti/yeti-hurt2.ogg</sound> + <sound event="hurt">monsters/yeti/yeti-hurt3.ogg</sound> + <sound event="miss">monsters/yeti/yeti-miss1.ogg</sound> + <sound event="miss">monsters/yeti/yeti-miss2.ogg</sound> + <sound event="miss">monsters/yeti/yeti-miss3.ogg</sound> + <sound event="move">monsters/yeti/yeti-move1.ogg</sound> + <sound event="move">monsters/yeti/yeti-move2.ogg</sound> + <sound event="move">monsters/yeti/yeti-move3.ogg</sound> + <sound event="move">monsters/yeti/yeti-move4.ogg</sound> + </monster> + + <monster id="1073" name="The Lost"> + <sprite>monsters/skeleton.xml|#aca379</sprite> + <sprite>equipment/chest/robe.xml|#333333</sprite> + <sprite>equipment/head/phylactery.xml</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + <attack id="1" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/> + </monster> + + <monster id="1074" name="Red Bone"> + <sprite>monsters/skeleton.xml|#994040,772020,440808,000000</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + <particlefx>graphics/particles/necroblast.particle.xml</particlefx> + </monster> + + <monster id="1075" name="Stalker"> + <sprite>monsters/wraith.xml</sprite> + </monster> + + <!-- Monster ID 1076 is free --> + <monster id="1077" name="Drunken Skeleton"> + <sprite>monsters/skeleton.xml|#ffe8bf</sprite> + <sprite>equipment/legs/chaps.xml</sprite> + <sprite>equipment/chest/vnecksweater.xml|#580000,A40000,C02020,ff6060</sprite> + <sprite>equipment/head/tophat.xml</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + </monster> + + <monster id="1078" name="Tipsy Skeleton"> + <sprite>monsters/skeleton.xml|#ffe8bf</sprite> + <sprite>equipment/legs/chaps.xml</sprite> + <sprite>equipment/chest/vnecksweater.xml|#0d1430,21337c,4363e5</sprite> + <sprite>equipment/head/bowler-hat.xml</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + </monster> + + <monster id="1079" name="Drunken Lady Skeleton"> + <sprite>monsters/skeleton.xml|#ffe8bf</sprite> + <sprite>monsters/accessories/hairstyle08.xml|#ffe8bf</sprite> + <sprite>equipment/legs/skirt.xml|#3f221d,754d23,f5cea4</sprite> + <sprite>equipment/chest/shorttanktop.xml|#3f221d,754d23,f5cea4</sprite> + <sprite>equipment/head/heart-glasses.xml</sprite> + <sound event="die">monsters/skeleton_lady/ladyskel-die1.ogg</sound> + <sound event="die">monsters/skeleton_lady/ladyskel-die2.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton_lady/ladyskel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton_lady/ladyskel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton_lady/ladyskel-miss1.ogg</sound> + </monster> + + <monster id="1080" name="Blue Spark"> + <sprite>monsters/ball-lightning.xml</sprite> + <sprite>monsters/accessories/ball-lightning-shadow.xml</sprite> + <particlefx>graphics/particles/monster-ball-lightning-blue.particle.xml</particlefx> + </monster> + + <monster id="1081" name="Red Spark"> + <sprite>monsters/ball-lightning.xml</sprite> + <sprite>monsters/accessories/ball-lightning-shadow.xml</sprite> + <particlefx>graphics/particles/monster-ball-lightning-red.particle.xml</particlefx> + </monster> + + <monster id="1082" name="Serqet"> + <sprite>monsters/serqet.xml</sprite> + </monster> + + <monster id="1083" name="Huntsman Spider"> + <sprite>monsters/spider.xml|#1a160f,93774a,d2c3aa,ffffff;#a00000</sprite> + <sound event="die">monsters/spider/spider-die1.ogg</sound> + <sound event="hit">monsters/spider/spider-hit1.ogg</sound> + <sound event="hit">monsters/spider/spider-hit2.ogg</sound> + <sound event="hit">monsters/spider/spider-hit3.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + </monster> + + <monster id="1084" name="Crotcher Scorpion"> + <sprite>monsters/scorpion.xml|#211b0e,5c3e20,a68d42,ffffff</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + </monster> + + <monster id="1085" name="Ice Skull"> + <sprite>monsters/skull-ice.xml</sprite> + </monster> + + <monster id="1086" name="Fey Element"> + <sprite>monsters/element-ball.xml|#6d4e2f,98612c,c38a53,ffffff</sprite> + <particlefx>graphics/particles/monster-leaf.particle.xml</particlefx> + </monster> + + <monster id="1087" name="Larvern" targetCursor="small"> + <sprite>monsters/larvespa.xml|#211b0e,5c3e20,a68d42;#667C26</sprite> + </monster> + + <monster id="1088" name="Hyvern"> + <sprite>monsters/vespa.xml|#1a160f,93774a;#DEBFBF,BBA2A2</sprite> + </monster> + + <monster id="1089" name="Hungry Fluffy"> + <sprite>monsters/fluffy.xml</sprite> + <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound> + <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound> + <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound> + <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound> + <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound> + </monster> + + <monster id="1090" name="Wolvern"> + <sprite>monsters/wolvern.xml|#000000,64727a,8996a0,a6afbf,dce9f3,ffffff</sprite> + <sound event="hit">monsters/wolvern/wolvern-hit1.ogg</sound> + <sound event="hit">monsters/wolvern/wolvern-hit2.ogg</sound> + <sound event="miss">monsters/wolvern/wolvern-miss1.ogg</sound> + <sound event="miss">monsters/wolvern/wolvern-miss2.ogg</sound> + <sound event="miss">monsters/wolvern/wolvern-miss3.ogg</sound> + <sound event="die">monsters/wolvern/wolvern-dying1.ogg</sound> + </monster> + + <monster id="1091" name="Blue Slime"> + <sprite>monsters/slime.xml|#2121ae,ffffff</sprite> + <sprite>monsters/accessories/slime-littleslime.xml|#2121ae,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1092" name="Slime Blast"> + <sprite>monsters/accessories/slime-slimeblast.xml|#2121ae,ffffff</sprite> + <sound event="die">monsters/slime/slime-hit1.ogg</sound> + </monster> + + <monster id="1093" name="White Slime"> + <sprite>monsters/accessories/slime-slimeblast.xml|#dcdcff,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1094" name="Reinboo"> + <sprite>monsters/christmas-mouboo.xml</sprite> + <sprite>monsters/accessories/mouboo-red-nose.xml</sprite> + <sprite>monsters/accessories/mouboo-red-saddle.xml</sprite> + <sprite>monsters/accessories/mouboo-red-shoes.xml</sprite> + <sprite>monsters/accessories/mouboo-antlers.xml</sprite> + </monster> + + <monster id="1095" name="White Bell"> + <sprite>monsters/snowflower.xml</sprite> + </monster> + + <monster id="1096" name="Soul Snake"> + <sprite>monsters/snake.xml|#664d28,a6673a,86D6DB,ffffff</sprite> + <particlefx>graphics/particles/monster-soulsnake.particle.xml</particlefx> + </monster> + + <monster id="1097" name="Soul Eater"> + <sprite>monsters/skeleton.xml|#D9BFFF</sprite> + <sprite>equipment/chest/tanktop.xml|#333333,555555,444444</sprite> + <sprite>equipment/legs/shorts.xml|#333333,555555,444444</sprite> + <sprite>monsters/accessories/hairstyle05.xml|#333333</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + <particlefx>graphics/particles/monster-souleater.particle.xml</particlefx> + </monster> + + <monster id="1098" name="Copper Slime"> + <sprite>monsters/slime.xml|#a1734c,ffffff</sprite> + <sprite>monsters/accessories/slime-seajelly.xml|#a1744c,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1099" name="Sleeping Bandit"> + <sprite>monsters/sleeping-bandit.xml</sprite> + <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + </monster> + + <monster id="1100" name="Azul Slime"> + <sprite>monsters/slime-littleslime.xml|#3080e4,d2f4ff</sprite> + <sound event="die">monsters/slime/slime-hit1.ogg</sound> + </monster> + + <monster id="1101" name="Demonic Spirit"> + <sprite>monsters/spirit-demonic.xml|#444444,9933ff</sprite> + </monster> + + <monster id="1102" name="Luvia"> + <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#8c6625,dab425,ffffff</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> + <sprite>equipment/chest/sorcerer-robe-female.xml|#121212,343434;#8F47D6</sprite> + <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite> + <sound event="die">system/boom.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx> + <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/luvia-attack.particle.xml" action="attack"/> + </monster> + + <monster id="1103" name="Witch Guard"> + <sprite>monsters/demon.xml|#444444,979797</sprite> + <sprite>equipment/feet/warlordboots.xml|#333333,878787</sprite> + <sprite>equipment/hands/generic.xml|#242424,626262</sprite> + <sprite>equipment/chest/demonwarlordplate.xml|#444444,979797</sprite> + <sprite>equipment/head/bull.xml</sprite> + <sprite>equipment/weapons/dagger.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0</sprite> + <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx> + </monster> + + <monster id="1104" name="Demonic Mouboo"> + <sprite>monsters/mouboo-demonic.xml</sprite> + <sprite>monsters/accessories/mouboo-demonic-antlers.xml</sprite> + <particlefx>graphics/particles/monster-mouboo-demonic.particle.xml</particlefx> + </monster> + + <monster id="1105" name="Vicious Squirrel"> + <sprite>monsters/squirrel.xml|#736443</sprite> + <sound event="hurt">monsters/squirrel/squirrel-hurt1.ogg</sound> + <sound event="hurt">monsters/squirrel/squirrel-hurt2.ogg</sound> + <sound event="die">monsters/squirrel/squirrel-die1.ogg</sound> + <sound event="die">monsters/squirrel/squirrel-die2.ogg</sound> + </monster> + + <monster id="1106" name="Wicked Mushroom"> + <sprite>monsters/mushroom-wicked.xml</sprite> + <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> + <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> + <sound event="die">monsters/shroom/shroom-die1.ogg</sound> + </monster> + + <monster id="1107" name="Bluepar" targetCursor="small"> + <sprite>monsters/bluepar.xml</sprite> + <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound> + <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound> + </monster> + + <monster id="1108" name="Angry Fire Goblin"> + <sprite>monsters/goblin-fire.xml</sprite> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> + <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> + <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> + <particlefx>graphics/particles/monster-angry-fire-goblin.particle.xml</particlefx> + <attack id="1" effect-id="400"/> + </monster> + + <monster id="1109" name="Angry Sea Slime"> + <sprite>monsters/slime.xml|#4ca1a0,ffffff</sprite> + <sprite>monsters/accessories/slime-seajelly.xml|#4Ca16e,ffffff</sprite> + <particlefx>graphics/particles/monster-angry-sea-slime.particle.xml</particlefx> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1110" name="Angry Green Slime"> + <sprite>monsters/slime.xml|#72982c,ffffff</sprite> + <particlefx>graphics/particles/monster-angry-green-slime.particle.xml</particlefx> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1111" name="Candied Slime"> + <sprite>monsters/slime.xml|#fd2273,ffbeff,ffffff</sprite> + <sprite>monsters/accessories/slime-bubble.xml|#feaaa7,fdfffb</sprite> + <attack id="1" missile-particle="graphics/particles/peppermint.particle.xml" action="attack"/> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1112" name="Santaboo"> + <sprite>monsters/christmas-mouboo.xml</sprite> + <sprite>monsters/accessories/mouboo-red-nose.xml</sprite> + <sprite>monsters/accessories/mouboo-red-saddle.xml</sprite> + <sprite>monsters/accessories/mouboo-red-shoes.xml</sprite> + <sprite>monsters/accessories/mouboo-santa-hat.xml</sprite> + </monster> + + <monster id="1113" name="Pollett"> + <sprite>monsters/penguin.xml</sprite> + <sound event="hit">monsters/pollett/pollett-hit1.ogg</sound> + <sound event="hit">monsters/pollett/pollett-hit2.ogg</sound> + <sound event="hit">monsters/pollett/pollett-hit3.ogg</sound> + <sound event="hit">monsters/pollett/pollett-hit4.ogg</sound> + <sound event="hurt">monsters/pollett/pollett-hurt1.ogg</sound> + <sound event="hurt">monsters/pollett/pollett-hurt2.ogg</sound> + <sound event="hurt">monsters/pollett/pollett-hurt3.ogg</sound> + <sound event="hurt">monsters/pollett/pollett-hurt4.ogg</sound> + <sound event="hurt">monsters/pollett/pollett-hurt5.ogg</sound> + <sound event="hurt">monsters/pollett/pollett-hurt6.ogg</sound> + </monster> + + <monster id="1114" name="Nut Cracker"> + <sprite>monsters/nutcracker.xml</sprite> + <sprite>monsters/accessories/hairstyle07.xml|#333333</sprite> + <sprite>monsters/accessories/nutcrackerhat.xml</sprite> + </monster> + + <monster id="1115" name="Sea Slime Mother"> + <sprite>monsters/slime-mother.xml|#4ca1a0,ffffff</sprite> + <sprite>monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#4Ca16e,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + <attack id="1" missile-particle="graphics/particles/arrowh-sea-slime.particle.xml|#4Ca16e,ffffff" action="attack"/> + </monster> + + <monster id="1116" name="Undead Witch"> + <sprite>monsters/skeleton.xml|#ffe8bf</sprite> + <sprite>monsters/accessories/hairstyle08.xml</sprite> + <sprite>equipment/head/witch-hat.xml</sprite> + <sprite>equipment/chest/sorcerer-robe.xml|#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF</sprite> + <sprite>equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <sound event="die">monsters/skeleton_lady/ladyskel-die1.ogg</sound> + <sound event="die">monsters/skeleton_lady/ladyskel-die2.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="hurt">monsters/skeleton_lady/ladyskel-hurt1.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss1.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss2.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss3.ogg</sound> + <attack id="1" missile-particle="graphics/particles/undead-witch-attack.particle.xml" action="attack"/> + </monster> + + <monster id="1117" name="Undead Troll"> + <sprite>monsters/troll.xml|#BFBFBF;#F1F1F1;#FF99FF;#F1F1F1</sprite> + <attack id="1" missile-particle="graphics/particles/monster-undeadtroll-foefire.particle.xml" action="attack"/> + <sound event="hit">env/flame.ogg</sound> + <sound event="miss">env/flame.ogg</sound> + </monster> + + <monster id="1118" name="Green Slime Mother"> + <sprite>monsters/slime-mother.xml|#72982c,ffffff</sprite> + <sprite>monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#72982c,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + <attack id="1" missile-particle="graphics/particles/arrowh-green-slime.particle.xml|#72982c,ffffff" action="attack"/> + </monster> + + <monster id="1119" name="Thug"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> + <sprite>equipment/head/sailor-hat.xml</sprite> + <sprite>equipment/feet/boots.xml</sprite> + <sprite>equipment/chest/tanktop.xml</sprite> + <sprite>equipment/legs/pants.xml</sprite> + <sound event="die">env/spawn_burst.ogg</sound> + <sound event="hit">weapons/punch1.ogg</sound> + <sound event="hit">weapons/punch2.ogg</sound> + <sound event="hit">weapons/punch3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + </monster> + + <monster id="1120" name="Swashbuckler"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> + <sprite>equipment/chest/vnecksweater.xml</sprite> + <sprite>equipment/legs/pants.xml|#212121,555555</sprite> + <sprite>equipment/head/bandana.xml|#212121,555555</sprite> + <sprite>equipment/feet/boots.xml|#212121,555555</sprite> + <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="die">env/spawn_burst.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + </monster> + + <monster id="1121" name="Grenadier"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> + <sprite>equipment/chest/sorcerer-robe.xml|#5178a0,1a294c;#d5b02c</sprite> + <sprite>equipment/legs/pants.xml|#5178a0,1a294c</sprite> + <sprite>equipment/head/piratehat.xml</sprite> + <sprite>equipment/hands/generic.xml</sprite> + <sprite>equipment/feet/boots.xml|#212121,444444</sprite> + <sound event="die">env/spawn_burst.ogg</sound> + <sound event="hit">system/crit.ogg</sound> + <sound event="miss">system/crit.ogg</sound> + <attack id="1" critical-hit-effect-id="30" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/> + </monster> + + <monster id="1122" name="The Dread Pirate Marley"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> + <sprite>equipment/chest/assassin.xml</sprite> + <sprite>equipment/legs/assassin.xml</sprite> + <sprite>equipment/head/eyepatch.xml</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <sound event="die">env/spawn_burst.ogg</sound> + <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> + <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> + <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/> + </monster> + + <monster id="1123" name="The Dread Pirate Marley"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> + <sprite>equipment/chest/assassin.xml</sprite> + <sprite>equipment/legs/assassin.xml</sprite> + <sprite>equipment/head/eyepatch.xml</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <sound event="die">env/spawn_burst.ogg</sound> + <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> + <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> + <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/> + </monster> + + <monster id="1124" name="Wight"> + <sprite>monsters/skeleton_inv.xml|#497ac3,2053a0,164995,154387</sprite> + <sprite>monsters/wight.xml|#164489,1f529f,619aea</sprite> + <sound event="die">monsters/skeleton/skel-die1.ogg</sound> + <sound event="die">monsters/skeleton/skel-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + <particlefx>graphics/particles/chillfog.particle.xml</particlefx> + </monster> + + <monster id="1125" name="Mana Ghost"> + <sprite>monsters/mana-ghost.xml</sprite> + <sound event="die">monsters/ghost/ghost-die1.ogg</sound> + <sound event="move">monsters/ghost/ghost-move1.ogg</sound> + <sound event="move">monsters/ghost/ghost-move2.ogg</sound> + <sound event="move">monsters/ghost/ghost-move3.ogg</sound> + </monster> + + <monster id="1126" name="Psi-Brain"> + <sprite>monsters/psi-brain.xml</sprite> + <sprite>monsters/psi-bubble.xml</sprite> + </monster> + + <monster id="1127" name="General Krukan"> + <sprite>monsters/skeleton.xml|#ffe8bf</sprite> + <sprite>equipment/legs/chaps.xml</sprite> + <sprite>equipment/chest/warlordplate.xml</sprite> + <sprite>equipment/head/dark-helm.xml</sprite> + <sound event="die">monsters/fallen/fallen-die2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> + <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + </monster> + + <monster id="1128" name="General Razha"> + <sprite>monsters/demon.xml|#444444,979797</sprite> + <sprite>equipment/feet/warlordboots.xml|#333333,878787</sprite> + <sprite>equipment/hands/generic.xml|#242424,626262</sprite> + <sprite>equipment/chest/demonwarlordplate.xml|#ea0000,979797</sprite> + <sprite>equipment/head/underworld-mask.xml</sprite> + <sprite>equipment/weapons/dagger.xml|#181619,1c1b00,1b1a31,54438a,5b5660,827e85,9596e0</sprite> + <sound event="die">monsters/fallen/fallen-die2.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound> + <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx> + </monster> + + <monster id="1129" name="General Terogan"> + <sprite>monsters/skeleton.xml|#aca379</sprite> + <sprite>equipment/chest/robe.xml|#ea0000,333333</sprite> + <sprite>equipment/head/phylactery.xml</sprite> + <!-- <sprite>equipment/head/evileyes.xml</sprite> Commented due to missing frame errors, which cause lag. evileyes.xml needs rework --> + <sprite>equipment/hands/magefire.xml</sprite> + <sound event="die">monsters/fallen/fallen-die2.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> + <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> + <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/> + </monster> + + <monster id="1130" name="Moonshroom"> + <sprite>monsters/moonshroom.xml</sprite> + <particlefx>graphics/particles/monster-moonshroom.particle.xml</particlefx> + <attack id="1" missile-particle="graphics/particles/moonshroom-attack.particle.xml" action="attack"/> + <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> + <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> + <sound event="die">monsters/shroom/shroom-die1.ogg</sound> + </monster> + + <monster id="1131" name="Mana Bug" targetCursor="small"> + <sprite>monsters/mana-bug.xml|#660000,FF3300,FFCC99,FFCCCC</sprite> + <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite> + </monster> + + <monster id="1132" name="Lava Slime"> + <sprite>monsters/slime.xml|#bb0201,ff9934,ffd366</sprite> + <particlefx>graphics/particles/firetrail.xml</particlefx> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + <attack id="1" critical-hit-effect-id="400" action="attack"/> + </monster> + + <monster id="1133" name="Anne"> + <sprite>monsters/lizard.xml|#923F7C,6E5A8C,C1B5B6</sprite> + <sound event="hit">monsters/wolvern/wolvern-hit1.ogg</sound> + </monster> + + <monster id="1134" name="SUSAN" targetCursor="large"> + <sprite>monsters/SUSAN.xml|R:#ff00e4</sprite> + <particlefx>graphics/particles/heartnecklace.particle.xml</particlefx> + <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> + <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> + <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> + <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> + </monster> + + <monster id="1135" name="Lovely Maggot" targetCursor="small"> + <sprite>monsters/lovely-maggot.xml|S:#524b51,8463a0,6f706f,af006d</sprite> + <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> + <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> + <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> --> + <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> + </monster> + + <monster id="1136" name="Lesser Ghost"> + <sprite>monsters/mana-ghost.xml</sprite> + </monster> + + <monster id="1137" name="Tormenta"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle13-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> + <sprite>equipment/chest/sorcerer-robe.xml|#121212,343434;#8F47D6</sprite> + <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite> + <sound event="die">system/boom.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx> + <particlefx>graphics/particles/soulpool.xml</particlefx> + <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/luvia-attack.particle.xml" action="attack"/> + </monster> + + <monster id="1138" name="Mana Guardian"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle08.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> + <sprite>equipment/chest/robe.xml|#ffffff</sprite> + <!-- No folder for this --> + <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/head/aureole.xml</sprite> + <sound event="hit">env/flame.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + <particlefx>graphics/particles/angel.particle.xml</particlefx> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + </monster> + + <monster id="1139" name="Virus"> + <sprite>monsters/virus.xml</sprite> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <attack id="1" missile-particle="graphics/particles/monster-virus-foefire.particle.xml" action="attack"/> + </monster> + + <monster id="1140" name="Tengu"> + <sprite>monsters/tengu.xml</sprite> + <sound event="die">monsters/tengu/die1.ogg</sound> + <sound event="hit">monsters/tengu/hit1.ogg</sound> + <sound event="hit">monsters/tengu/hit2.ogg</sound> + <sound event="hit">monsters/tengu/hit3.ogg</sound> + <sound event="hurt">monsters/tengu/hurt1.ogg</sound> + <sound event="hurt">monsters/tengu/hurt2.ogg</sound> + <sound event="hurt">monsters/tengu/hurt3.ogg</sound> + <sound event="miss">monsters/tengu/miss1.ogg</sound> + </monster> + + <monster id="1141" name="Sasquatch"> + <sprite>monsters/sasquatch.xml</sprite> + <sound event="die">monsters/yeti/yeti-die1.ogg</sound> + <sound event="hit">monsters/yeti/yeti-hit1.ogg</sound> + <sound event="hit">monsters/yeti/yeti-hit2.ogg</sound> + <sound event="hit">monsters/yeti/yeti-hit3.ogg</sound> + <sound event="hit">monsters/yeti/yeti-hit4.ogg</sound> + <sound event="hurt">monsters/yeti/yeti-hurt1.ogg</sound> + <sound event="hurt">monsters/yeti/yeti-hurt2.ogg</sound> + <sound event="hurt">monsters/yeti/yeti-hurt3.ogg</sound> + <sound event="miss">monsters/yeti/yeti-miss1.ogg</sound> + <sound event="miss">monsters/yeti/yeti-miss2.ogg</sound> + <sound event="miss">monsters/yeti/yeti-miss3.ogg</sound> + <sound event="move">monsters/sasquatch/sasquatch-move1.ogg</sound> + <sound event="move">monsters/sasquatch/sasquatch-move1.ogg</sound> + <sound event="move">monsters/sasquatch/sasquatch-move1.ogg</sound> + <sound event="move">monsters/sasquatch/sasquatch-move2.ogg</sound> + </monster> + + <monster id="1142" name="Zax De'Kagen"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle06-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> + <sprite>equipment/chest/sorcerer-robe.xml|#121212,343434;#8F47D6</sprite> + <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite> + <sound event="die">system/boom.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx> + <particlefx>graphics/particles/soulpool.xml</particlefx> + <particlefx>graphics/particles/angel.particle.xml</particlefx> + <sprite>equipment/head/katzeur.xml</sprite> + <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/luvia-attack.particle.xml" action="attack"/> + </monster> + + <monster id="1143" name="Mana Slayer"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle08.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> + <sprite>equipment/chest/robe.xml|#000000</sprite> + <!-- No folder for this --> + <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/head/aureole.xml</sprite> + <sprite>equipment/weapons/sandcutter.xml</sprite> + <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound> + <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + </monster> + + <monster id="1144" name="Great Dragon"> + <sprite>monsters/dragon.xml</sprite> + </monster> + + <monster id="1145" name="Coal Golem"> + <sprite>monsters/golem.xml</sprite> + <!-- No folder for this --> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + <sound event="die">monsters/golem/die.ogg</sound> + <sound event="hit">monsters/golem/hit1.ogg</sound> + <sound event="miss">monsters/golem/miss1.ogg</sound> + </monster> + + <monster id="1146" name="Flashmob"> + <sprite>model/base.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d55</sprite> + <sprite>hairstyles/hairstyle15.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/legs/assassin.xml</sprite> + <sprite>equipment/chest/bromenalchest.xml|#fbf5e9</sprite> + <!-- No folder for this --> + <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_2hand"/> + <sound event="die">monsters/flashmob/flashmob-die1.ogg</sound> + <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound> + <sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound> + <sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss1.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss2.ogg</sound> + <sound event="miss">weapons/other/staff/staff-miss3.ogg</sound> + <sound event="hurt">monsters/flashmob/flashmob-hurt1.ogg</sound> + <sound event="hurt">monsters/flashmob/flashmob-hurt2.ogg</sound> + <sound event="hurt">monsters/flashmob/flashmob-hurt3.ogg</sound> + <sound event="move">monsters/flashmob/flashmob-move1.ogg</sound> + <sound event="move">monsters/flashmob/flashmob-move2.ogg</sound> + <sound event="move">monsters/flashmob/flashmob-move3.ogg</sound> + <sound event="move">monsters/flashmob/flashmob-move4.ogg</sound> + </monster> + + <monster id="1147" name="Koyntety"> + <sprite>model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle09-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots-female.xml</sprite> + <sprite>equipment/legs/assassin-female.xml</sprite> + <sprite>equipment/chest/bromenalchest-female.xml|#fbf5e9</sprite> + <!-- No folder for this --> + <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/weapons/bow-female.xml</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_bow"/> + <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> + <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> + </monster> + + <monster id="1148" name="Doom Golem"> + <sprite>monsters/golem-red.xml</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + <sound event="die">monsters/golem/die.ogg</sound> + <sound event="hit">monsters/golem/hit1.ogg</sound> + <sound event="miss">monsters/golem/miss1.ogg</sound> + </monster> + + <monster id="1149" name="The Enchanter"> + <sprite>model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle09-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots-female.xml</sprite> + <sprite>equipment/legs/assassin-female.xml</sprite> + <sprite>equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite> + <!-- No folder for this --> + <sprite>equipment/weapons/bow-female.xml</sprite> + <particlefx>graphics/particles/doom.particle.xml</particlefx> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_bow"/> + <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> + <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> + </monster> + + <monster id="1150" name="Mana Tyrant"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle08.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> + <sprite>equipment/chest/robe.xml|#5e7480,f1ffff,ffffff</sprite> + <sprite>equipment/chest/warlordplate.xml</sprite> + <sprite>equipment/head/knighthelm.xml</sprite> + <!-- No folder for this --> + <sprite>equipment/angel-wings.xml</sprite> + <sprite>equipment/head/aureole.xml</sprite> + <sound event="hit">weapons/punch1.ogg</sound> + <sound event="hit">weapons/punch2.ogg</sound> + <sound event="hit">weapons/punch3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + <particlefx>graphics/particles/angel.particle.xml</particlefx> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + </monster> + + <monster id="1151" name="V0id Flower"> + <sprite>monsters/flower.xml|#f08808,e06808;#f6ffbd;#23285f</sprite> + <sound event="hit">monsters/flower/flower-hit1.ogg</sound> + <sound event="hit">monsters/flower/flower-hit2.ogg</sound> + <sound event="miss">monsters/flower/flower-miss1.ogg</sound> + </monster> + + <monster id="1152" name="V0id Archant"> + <sprite>monsters/archant.xml</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + </monster> + + <monster id="1153" name="V0id Slime"> + <sprite>monsters/slime.xml|#fc6e00,ffffff</sprite> + <sprite>monsters/accessories/slime-seajelly.xml|#ffaa00,ffffff</sprite> + <sound event="die">monsters/slime/slime-die1.ogg</sound> + <sound event="hit">monsters/slime/slime-hit1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> + <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> + <sound event="move">monsters/slime/slime-move1.ogg</sound> + <sound event="move">monsters/slime/slime-move2.ogg</sound> + </monster> + + <monster id="1154" name="V0id Snake"> + <sprite>monsters/snake.xml|#151515,505050,e02020;#a01010;#ffffff</sprite> + <sound event="hit">monsters/cavesnake/cavesnake-hit1.ogg</sound> + </monster> + + <monster id="1155" name="V0id Bat"> + <sprite>monsters/crafty.xml</sprite> + <sound event="die">monsters/bat/bat-dying1.ogg</sound> + <sound event="hit">monsters/bat/bat-hit1.ogg</sound> + </monster> + + <monster id="1156" name="V0id Maggot" targetCursor="small"> + <sprite>monsters/void-maggot.xml</sprite> + <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> + <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> + <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> --> + <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> + </monster> + + <monster id="1157" name="V0id Soldier"> + <sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> + <sprite>equipment/feet/warlordboots.xml|#333333,878787</sprite> + <sprite>equipment/hands/generic.xml|#242424,626262</sprite> + <sprite>equipment/chest/warlordplate.xml|#444444,979797</sprite> + <sprite>equipment/head/bull.xml</sprite> + <sprite>equipment/weapons/bow-banshee.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0</sprite> + <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> + <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> + <attack id="1" critical-hit-effect-id="28" missile-particle="graphics/particles/arrow.particle.xml" action="attack_bow"/> + </monster> + + <monster id="1158" name="V0id Mouboo"> + <sprite>monsters/moubi.xml</sprite> + </monster> + + <monster id="1159" name="V0id Scorpion"> + <sprite>monsters/scorpion.xml|#fc6e00,fa9a00,ffff00,ffffff</sprite> + <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> + <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + <sound event="die">monsters/spider/spider-die1.ogg</sound> + </monster> + + <monster id="1160" name="V0id Mushroom"> + <sprite>monsters/mushroom-void.xml</sprite> + <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> + <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> + <sound event="die">monsters/shroom/shroom-die1.ogg</sound> + </monster> + + <monster id="1161" name="Xakelbael the Dark"> + <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle06-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> + <sprite>equipment/feet/assassin-boots.xml</sprite> + <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> + <sprite>equipment/chest/sorcerer-robe.xml|#846928,dab641,ffef93,fff7c9;#8F47D6</sprite> + <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite> + <sound event="die">system/boom.ogg</sound> + <sound event="hit">magic/confringo1.ogg</sound> + <sound event="hit">magic/confringo2.ogg</sound> + <sound event="hit">magic/confringo3.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx> + <particlefx>graphics/particles/angel.particle.xml</particlefx> + <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/luvia-attack.particle.xml" action="attack"/> + </monster> + + <monster id="1162" name="Grinchboo"> + <sprite>monsters/grinchboo.xml</sprite> + </monster> + + <monster id="1163" name="Friday"> + <sprite>monsters/pet-black-cat.xml</sprite> + </monster> + + <monster id="1164" name="Christmas Tree"> + <sprite>npcs/christmastree.xml</sprite> + </monster> + + <monster id="1165" name="Christmas Gift"> + <sprite>monsters/presente-surpresa.xml</sprite> + </monster> + + <monster id="1166" name="Snowman"> + <sprite>monsters/snowman.xml</sprite> + <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound> + <sound event="miss">weapons/projectiles/snowball/miss1.ogg</sound> + </monster> + + <monster id="1167" name="Der Schneemann"> + <sprite>monsters/snowman-boss.xml</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/snow-burst.xml" action="attack"/> + <sound event="hit">monsters/snowman_boss/hit1.ogg</sound> + <sound event="miss">monsters/snowman_boss/miss1.ogg</sound> + </monster> + + <monster id="1168" name="Floyd"> + <sprite>monsters/floyd.xml</sprite> + <sound event="hit">env/zap.ogg</sound> + </monster> + + <monster id="1169" name="Crystal Spider"> + <sprite>monsters/spider-crystal.xml</sprite> + <sound event="hit">monsters/spider/spider-hit1.ogg</sound> + <sound event="hit">monsters/spider/spider-hit2.ogg</sound> + <sound event="hit">monsters/spider/spider-hit3.ogg</sound> + <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> + <sound event="move">monsters/spider/spider-move1.ogg</sound> + <sound event="move">monsters/spider/spider-move2.ogg</sound> + <sound event="move">monsters/spider/spider-move3.ogg</sound> + <sound event="move">monsters/spider/spider-move4.ogg</sound> + <sound event="move">monsters/spider/spider-move5.ogg</sound> + <sound event="die">monsters/spider/spider-die1.ogg</sound> + </monster> + + <monster id="1170" name="Crystal Golem"> + <sprite>monsters/golem-crystal.xml</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + <sound event="die">monsters/golem/die.ogg</sound> + <sound event="hit">monsters/golem/hit1.ogg</sound> + <sound event="miss">monsters/golem/miss1.ogg</sound> + </monster> + + <monster id="1171" name="Black Crystal Golem"> + <sprite>monsters/golem-blackcrystal.xml</sprite> + <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> + <sound event="die">monsters/golem/die.ogg</sound> + <sound event="hit">monsters/golem/hit1.ogg</sound> + <sound event="miss">monsters/golem/miss1.ogg</sound> + </monster> + <monster id="1172" name="Bif" targetCursor="medium"> <sprite>monsters/bif.xml</sprite> </monster> + + <monster id="1173" name="Mont Blanc" targetCursor="large"> + <sprite>monsters/montblanc.xml</sprite> + </monster> + + <monster id="1174" name="Emo"> + <sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> + <sprite>hairstyles/hairstyle27.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> + <sprite>equipment/chest/leather.xml|#573a26,c9866b,d3b79e,ffffff;#b96b3d,fbf5f1</sprite> + <sprite>equipment/legs/pants.xml|#2a2117,2f2112,493219,61411e,724c22,a97e4f</sprite> + <sprite>equipment/head/shades.xml|#104010,208020,30c030</sprite> + <sprite>equipment/feet/boots.xml|#212121,555555</sprite> + <sprite>equipment/hands/generic.xml|#4e2e18,c8752f</sprite> + <sprite>equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sprite>equipment/shields/wooden.xml</sprite> + <sound event="die">env/spawn_burst.ogg</sound> + <sound event="hit">weapons/swords/longsword-hit1.ogg</sound> + <sound event="hit">weapons/swords/longsword-hit2.ogg</sound> + <sound event="miss">weapons/miss1.ogg</sound> + <sound event="miss">weapons/miss2.ogg</sound> + <sound event="miss">weapons/miss3.ogg</sound> + </monster> + + <!-- Mods should use the following code --> + <include name="mods/monsters.xml" /> </monsters> diff --git a/monsters/_include.xml b/monsters/_include.xml deleted file mode 100644 index c64a6ce0..00000000 --- a/monsters/_include.xml +++ /dev/null @@ -1,169 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <include name="monsters/monster1002_Maggot.xml"/> - <include name="monsters/monster1003_Scorpion.xml"/> - <include name="monsters/monster1004_RedScorpion.xml"/> - <include name="monsters/monster1005_GreenSlime.xml"/> - <include name="monsters/monster1006_GiantMaggot.xml"/> - <include name="monsters/monster1007_YellowSlime.xml"/> - <include name="monsters/monster1008_RedSlime.xml"/> - <include name="monsters/monster1009_BlackScorpion.xml"/> - <include name="monsters/monster1010_Snake.xml"/> - <include name="monsters/monster1011_FireGoblin.xml"/> - <include name="monsters/monster1012_Spider.xml"/> - <include name="monsters/monster1013_EvilMushroom.xml"/> - <include name="monsters/monster1014_PinkFlower.xml"/> - <include name="monsters/monster1015_SantaSlime.xml"/> - <include name="monsters/monster1016_RudolphSlime.xml"/> - <include name="monsters/monster1017_Bat.xml"/> - <include name="monsters/monster1018_Pinkie.xml"/> - <include name="monsters/monster1019_SpikyMushroom.xml"/> - <include name="monsters/monster1020_Fluffy.xml"/> - <include name="monsters/monster1021_CaveSnake.xml"/> - <include name="monsters/monster1022_JackO.xml"/> - <include name="monsters/monster1023_FireSkull.xml"/> - <include name="monsters/monster1024_PoisonSkull.xml"/> - <include name="monsters/monster1025_LogHead.xml"/> - <include name="monsters/monster1026_MountainSnake.xml"/> - <include name="monsters/monster1027_EasterFluffy.xml"/> - <include name="monsters/monster1028_Mouboo.xml"/> - <include name="monsters/monster1029_MauvePlant.xml"/> - <include name="monsters/monster1030_CobaltPlant.xml"/> - <include name="monsters/monster1031_GambogePlant.xml"/> - <include name="monsters/monster1032_AlizarinPlant.xml"/> - <include name="monsters/monster1033_SeaSlime.xml"/> - <include name="monsters/monster1034_GrassSnake.xml"/> - <include name="monsters/monster1035_Silkworm.xml"/> - <include name="monsters/monster1036_Zombie.xml"/> - <include name="monsters/monster1037_CloverPatch.xml"/> - <include name="monsters/monster1038_Squirrel.xml"/> - <include name="monsters/monster1039_FireLizard.xml"/> - <include name="monsters/monster1040_Wisp.xml"/> - <include name="monsters/monster1041_Snail.xml"/> - <include name="monsters/monster1042_Spectre.xml"/> - <include name="monsters/monster1043_Skeleton.xml"/> - <include name="monsters/monster1044_LadySkeleton.xml"/> - <include name="monsters/monster1045_Fallen.xml"/> - <include name="monsters/monster1046_TameScorpion.xml"/> - <include name="monsters/monster1047_Poltergeist.xml"/> - <include name="monsters/monster1048_Duck.xml"/> - <include name="monsters/monster1049_Bee.xml"/> - <include name="monsters/monster1050_HouseMaggot.xml"/> - <include name="monsters/monster1054_Troll.xml"/> - <include name="monsters/monster1055_Butterfly.xml"/> - <include name="monsters/monster1056_CaveMaggot.xml"/> - <include name="monsters/monster1057_AngryScorpion.xml"/> - <include name="monsters/monster1058_IceGoblin.xml"/> - <include name="monsters/monster1059_GiantCaveMaggot.xml"/> - <include name="monsters/monster1060_Archant.xml"/> - <include name="monsters/monster1061_Moggun.xml"/> - <include name="monsters/monster1062_Terranite.xml"/> - <include name="monsters/monster1063_Pumpkin.xml"/> - <include name="monsters/monster1064_Bandit.xml"/> - <include name="monsters/monster1065_BanditLord.xml"/> - <include name="monsters/monster1066_VampireBat.xml"/> - <include name="monsters/monster1067_Reaper.xml"/> - <include name="monsters/monster1068_Reaper.xml"/> - <include name="monsters/monster1069_Scythe.xml"/> - <include name="monsters/monster1070_BallLightning.xml"/> - <include name="monsters/monster1071_IceElement.xml"/> - <include name="monsters/monster1072_Yeti.xml"/> - <include name="monsters/monster1073_TheLost.xml"/> - <include name="monsters/monster1074_RedBone.xml"/> - <include name="monsters/monster1075_Stalker.xml"/> - <include name="monsters/monster1077_DrunkenSkeleton.xml"/> - <include name="monsters/monster1078_TipsySkeleton.xml"/> - <include name="monsters/monster1079_DrunkenLadySkeleton.xml"/> - <include name="monsters/monster1080_BlueSpark.xml"/> - <include name="monsters/monster1081_RedSpark.xml"/> - <include name="monsters/monster1082_Serqet.xml"/> - <include name="monsters/monster1083_HuntsmanSpider.xml"/> - <include name="monsters/monster1084_CrotcherScorpion.xml"/> - <include name="monsters/monster1085_IceSkull.xml"/> - <include name="monsters/monster1086_FeyElement.xml"/> - <include name="monsters/monster1087_Larvern.xml"/> - <include name="monsters/monster1088_Hyvern.xml"/> - <include name="monsters/monster1089_HungryFluffy.xml"/> - <include name="monsters/monster1090_Wolvern.xml"/> - <include name="monsters/monster1091_BlueSlime.xml"/> - <include name="monsters/monster1092_SlimeBlast.xml"/> - <include name="monsters/monster1093_WhiteSlime.xml"/> - <include name="monsters/monster1094_Reinboo.xml"/> - <include name="monsters/monster1095_WhiteBell.xml"/> - <include name="monsters/monster1096_SoulSnake.xml"/> - <include name="monsters/monster1097_SoulEater.xml"/> - <include name="monsters/monster1098_CopperSlime.xml"/> - <include name="monsters/monster1099_SleepingBandit.xml"/> - <include name="monsters/monster1100_AzulSlime.xml"/> - <include name="monsters/monster1101_DemonicSpirit.xml"/> - <include name="monsters/monster1102_Luvia.xml"/> - <include name="monsters/monster1103_WitchGuard.xml"/> - <include name="monsters/monster1104_DemonicMouboo.xml"/> - <include name="monsters/monster1105_ViciousSquirrel.xml"/> - <include name="monsters/monster1106_WickedMushroom.xml"/> - <include name="monsters/monster1107_Bluepar.xml"/> - <include name="monsters/monster1108_AngryFireGoblin.xml"/> - <include name="monsters/monster1109_AngrySeaSlime.xml"/> - <include name="monsters/monster1110_AngryGreenSlime.xml"/> - <include name="monsters/monster1111_CandiedSlime.xml"/> - <include name="monsters/monster1112_Santaboo.xml"/> - <include name="monsters/monster1113_Pollett.xml"/> - <include name="monsters/monster1114_NutCracker.xml"/> - <include name="monsters/monster1115_SeaSlimeMother.xml"/> - <include name="monsters/monster1116_UndeadWitch.xml"/> - <include name="monsters/monster1117_UndeadTroll.xml"/> - <include name="monsters/monster1118_GreenSlimeMother.xml"/> - <include name="monsters/monster1119_Thug.xml"/> - <include name="monsters/monster1120_Swashbuckler.xml"/> - <include name="monsters/monster1121_Grenadier.xml"/> - <include name="monsters/monster1122_TheDreadPirateMarley.xml"/> - <include name="monsters/monster1123_TheDreadPirateMarley.xml"/> - <include name="monsters/monster1124_Wight.xml"/> - <include name="monsters/monster1125_ManaGhost.xml"/> - <include name="monsters/monster1126_PsiBrain.xml"/> - <include name="monsters/monster1127_GeneralKrukan.xml"/> - <include name="monsters/monster1128_GeneralRazha.xml"/> - <include name="monsters/monster1129_GeneralTerogan.xml"/> - <include name="monsters/monster1130_Moonshroom.xml"/> - <include name="monsters/monster1131_ManaBug.xml"/> - <include name="monsters/monster1132_LavaSlime.xml"/> - <include name="monsters/monster1133_Anne.xml"/> - <include name="monsters/monster1134_SUSAN.xml"/> - <include name="monsters/monster1135_LovelyMaggot.xml"/> - <include name="monsters/monster1136_LesserGhost.xml"/> - <include name="monsters/monster1137_Tormenta.xml"/> - <include name="monsters/monster1138_ManaGuardian.xml"/> - <include name="monsters/monster1139_Virus.xml"/> - <include name="monsters/monster1140_Tengu.xml"/> - <include name="monsters/monster1141_Sasquatch.xml"/> - <include name="monsters/monster1142_Kage.xml"/> - <include name="monsters/monster1143_ManaSlayer.xml"/> - <include name="monsters/monster1144_GreatDragon.xml"/> - <include name="monsters/monster1145_Golem.xml"/> - <include name="monsters/monster1146_Flashmob.xml"/> - <include name="monsters/monster1147_Koyntety.xml"/> - <include name="monsters/monster1148_DoomGolem.xml"/> - <include name="monsters/monster1149_TheEnchanter.xml"/> - <include name="monsters/monster1150_ManaTyrant.xml"/> - <include name="monsters/monster1151_VoidFlower.xml"/> - <include name="monsters/monster1152_VoidArchant.xml"/> - <include name="monsters/monster1153_VoidSlime.xml"/> - <include name="monsters/monster1154_VoidSnake.xml"/> - <include name="monsters/monster1155_VoidBat.xml"/> - <include name="monsters/monster1156_VoidMaggot.xml"/> - <include name="monsters/monster1157_VoidSoldier.xml"/> - <include name="monsters/monster1158_VoidMouboo.xml"/> - <include name="monsters/monster1159_VoidScorpion.xml"/> - <include name="monsters/monster1160_VoidShroom.xml"/> - <include name="monsters/monster1161_Xakelbael.xml"/> - <include name="monsters/monster1162_Grinchboo.xml"/> - <include name="monsters/monster1163_FridayCat.xml"/> - <include name="monsters/monster1164_CristmasTree.xml"/> - <include name="monsters/monster1165_CristmasGift.xml"/> - <include name="monsters/monster1166_Snowman.xml"/> - <include name="monsters/monster1167_SnowmanBoss.xml"/> - <include name="monsters/monster1168_Floyd.xml"/> - <include name="monsters/monster1169_CrystalSpider.xml"/> - <include name="monsters/monster1170_CrystalGolem.xml"/> - <include name="monsters/monster1171_BlackCrystalGolem.xml"/> -</monsters> diff --git a/monsters/monster1002_Maggot.xml b/monsters/monster1002_Maggot.xml deleted file mode 100644 index 5a2261b5..00000000 --- a/monsters/monster1002_Maggot.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1002" name="Maggot" targetCursor="small"> - <sprite>monsters/maggot.xml</sprite> - <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> - <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> - <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> - <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1003_Scorpion.xml b/monsters/monster1003_Scorpion.xml deleted file mode 100644 index ff09cf94..00000000 --- a/monsters/monster1003_Scorpion.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1003" name="Scorpion"> - <sprite>monsters/scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - <sound event="die">monsters/spider/spider-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1004_RedScorpion.xml b/monsters/monster1004_RedScorpion.xml deleted file mode 100644 index 35a1c007..00000000 --- a/monsters/monster1004_RedScorpion.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1004" name="Red Scorpion"> - <sprite>monsters/scorpion.xml|#791d0a,cd5d27,f28d54,ffffff</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - <sound event="die">monsters/spider/spider-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1005_GreenSlime.xml b/monsters/monster1005_GreenSlime.xml deleted file mode 100644 index 2b17c4ec..00000000 --- a/monsters/monster1005_GreenSlime.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1005" name="Green Slime"> - <sprite>monsters/slime.xml|#72982c,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1006_GiantMaggot.xml b/monsters/monster1006_GiantMaggot.xml deleted file mode 100644 index ef5b3cdc..00000000 --- a/monsters/monster1006_GiantMaggot.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1006" name="Giant Maggot" targetCursor="large"> - <sprite>monsters/maggot-giant.xml</sprite> - <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> - <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> - <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> - <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1007_YellowSlime.xml b/monsters/monster1007_YellowSlime.xml deleted file mode 100644 index 775c1cd4..00000000 --- a/monsters/monster1007_YellowSlime.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1007" name="Yellow Slime"> - <sprite>monsters/slime.xml|#b47f00,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1008_RedSlime.xml b/monsters/monster1008_RedSlime.xml deleted file mode 100644 index d1706340..00000000 --- a/monsters/monster1008_RedSlime.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1008" name="Red Slime"> - <sprite>monsters/slime.xml|#7e0000,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1009_BlackScorpion.xml b/monsters/monster1009_BlackScorpion.xml deleted file mode 100644 index bfd7fba6..00000000 --- a/monsters/monster1009_BlackScorpion.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1009" name="Black Scorpion"> - <sprite>monsters/scorpion.xml|#0d1313,435a5a,879999,ffffff</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - <sound event="die">monsters/spider/spider-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1010_Snake.xml b/monsters/monster1010_Snake.xml deleted file mode 100644 index dd5954ae..00000000 --- a/monsters/monster1010_Snake.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1010" name="Snake"> - <sprite>monsters/snake.xml|#664d28,a6673a,dbbc86,ffffff</sprite> - </monster> -</monsters> diff --git a/monsters/monster1011_FireGoblin.xml b/monsters/monster1011_FireGoblin.xml deleted file mode 100644 index 39afdde3..00000000 --- a/monsters/monster1011_FireGoblin.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1011" name="Fire Goblin"> - <sprite>monsters/goblin-fire.xml</sprite> - <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> - <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> - <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> - <attack id="1" effect-id="400"/> - </monster> -</monsters> diff --git a/monsters/monster1012_Spider.xml b/monsters/monster1012_Spider.xml deleted file mode 100644 index 44eaceb9..00000000 --- a/monsters/monster1012_Spider.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1012" name="Spider"> - <sprite>monsters/spider.xml|#1a160f,4A7A93,AAC5D2,ffffff;#FF6666</sprite> - <sound event="hit">monsters/spider/spider-hit1.ogg</sound> - <sound event="hit">monsters/spider/spider-hit2.ogg</sound> - <sound event="hit">monsters/spider/spider-hit3.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - <sound event="die">monsters/spider/spider-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1013_EvilMushroom.xml b/monsters/monster1013_EvilMushroom.xml deleted file mode 100644 index cdf704d6..00000000 --- a/monsters/monster1013_EvilMushroom.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1013" name="Evil Mushroom"> - <sprite>monsters/accessories/mushroom-base1.xml|#B38336,FFF5CC</sprite> - <sprite>monsters/accessories/mushroom-base1-arms1.xml|#B38336,FFF5CC</sprite> - <sprite>monsters/accessories/mushroom-base1-face2.xml|#732222,BF3939,FF9E9E,FFD9D9,FFFFFF;#B38336,FFF5CC</sprite> - <sprite>monsters/accessories/mushroom-base1-cap1.xml|#732222,BF3939,FF9E9E,FFD9D9,FFFFFF;#B38336,FFF5CC</sprite> - <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> - <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> - <sound event="die">monsters/shroom/shroom-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1014_PinkFlower.xml b/monsters/monster1014_PinkFlower.xml deleted file mode 100644 index 92bf8814..00000000 --- a/monsters/monster1014_PinkFlower.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1014" name="Pink Flower"> - <sprite>monsters/flower.xml|#ee748d,ffd8ce;#f6ffbd;#23285f</sprite> - <sound event="hit">monsters/flower/flower-hit1.ogg</sound> - <sound event="hit">monsters/flower/flower-hit2.ogg</sound> - <sound event="miss">monsters/flower/flower-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1015_SantaSlime.xml b/monsters/monster1015_SantaSlime.xml deleted file mode 100644 index 218bbab7..00000000 --- a/monsters/monster1015_SantaSlime.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1015" name="Santa Slime"> - <sprite>monsters/slime.xml|#545166,66A9CD,C2F7FA</sprite> - <sprite>monsters/accessories/slime-santa.xml</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1016_RudolphSlime.xml b/monsters/monster1016_RudolphSlime.xml deleted file mode 100644 index f6d26ae4..00000000 --- a/monsters/monster1016_RudolphSlime.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1016" name="Rudolph Slime"> - <sprite>monsters/slime.xml|#9092B9,9DB4D4,F8F9FA</sprite> - <sprite>monsters/accessories/slime-rudolph.xml</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1017_Bat.xml b/monsters/monster1017_Bat.xml deleted file mode 100644 index 8372299c..00000000 --- a/monsters/monster1017_Bat.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1017" name="Bat"> - <sprite>monsters/bat.xml</sprite> - <sound event="die">monsters/bat/bat-dying1.ogg</sound> - <sound event="hit">monsters/bat/bat-hit1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1018_Pinkie.xml b/monsters/monster1018_Pinkie.xml deleted file mode 100644 index d9af3733..00000000 --- a/monsters/monster1018_Pinkie.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1018" name="Pinkie" targetCursor="small"> - <sprite>monsters/pinkie.xml</sprite> - <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound> - <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1019_SpikyMushroom.xml b/monsters/monster1019_SpikyMushroom.xml deleted file mode 100644 index b573c440..00000000 --- a/monsters/monster1019_SpikyMushroom.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1019" name="Spiky Mushroom"> - <sprite>monsters/accessories/mushroom-base1.xml|#B37410,FFF5CC</sprite> - <sprite>monsters/accessories/mushroom-base1-face1.xml|#730A73,BF31C0,FF9EFF,FFD9FF,FFFFFF;#7B4E07,FFF5CC</sprite> - <sprite>monsters/accessories/mushroom-base1-cap1.xml|#730A73,BF31C0,FF9EFF,FFD9FF,FFFFFF;#B36E00,FFF5CC</sprite> - <sprite>monsters/accessories/mushroom-base1-cap1-spikes.xml|#CC9C3D,FFFFCC</sprite> - <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> - <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> - <sound event="die">monsters/shroom/shroom-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1020_Fluffy.xml b/monsters/monster1020_Fluffy.xml deleted file mode 100644 index 17087d0d..00000000 --- a/monsters/monster1020_Fluffy.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1020" name="Fluffy"> - <sprite>monsters/fluffy.xml</sprite> - <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound> - <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound> - <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound> - <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound> - <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1021_CaveSnake.xml b/monsters/monster1021_CaveSnake.xml deleted file mode 100644 index 6a397f37..00000000 --- a/monsters/monster1021_CaveSnake.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1021" name="Cave Snake"> - <sprite>monsters/snake-cave.xml</sprite> - <sound event="hit">monsters/cavesnake/cavesnake-hit1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1022_JackO.xml b/monsters/monster1022_JackO.xml deleted file mode 100644 index 983988f2..00000000 --- a/monsters/monster1022_JackO.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1022" name="Jack O"> - <sprite>monsters/ghost-pumpkin.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1023_FireSkull.xml b/monsters/monster1023_FireSkull.xml deleted file mode 100644 index 4369d2b8..00000000 --- a/monsters/monster1023_FireSkull.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1023" name="Fire Skull"> - <sprite>monsters/skull-fire.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1024_PoisonSkull.xml b/monsters/monster1024_PoisonSkull.xml deleted file mode 100644 index b0d71f2c..00000000 --- a/monsters/monster1024_PoisonSkull.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1024" name="Poison Skull"> - <sprite>monsters/skull-poison.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1025_LogHead.xml b/monsters/monster1025_LogHead.xml deleted file mode 100644 index b350bc1f..00000000 --- a/monsters/monster1025_LogHead.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1025" name="Log Head"> - <sprite>monsters/logmonster.xml</sprite> - <sound event="hit">monsters/loghead/loghead-hit1.ogg</sound> - <sound event="hurt">monsters/loghead/loghead-hurt1.ogg</sound> - <sound event="hurt">monsters/loghead/loghead-hurt2.ogg</sound> - <sound event="hurt">monsters/loghead/loghead-hurt3.ogg</sound> - <sound event="hurt">monsters/loghead/loghead-hurt4.ogg</sound> - <sound event="hurt">monsters/loghead/loghead-hurt5.ogg</sound> - <sound event="die">monsters/loghead/loghead-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1026_MountainSnake.xml b/monsters/monster1026_MountainSnake.xml deleted file mode 100644 index a228db8d..00000000 --- a/monsters/monster1026_MountainSnake.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1026" name="Mountain Snake"> - <sprite>monsters/snake.xml|#585b39,a67c5d,dbc9a9,ffffff</sprite> - </monster> -</monsters> diff --git a/monsters/monster1027_EasterFluffy.xml b/monsters/monster1027_EasterFluffy.xml deleted file mode 100644 index a3381436..00000000 --- a/monsters/monster1027_EasterFluffy.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1027" name="Easter Fluffy"> - <sprite>monsters/fluffy.xml</sprite> - <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound> - <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound> - <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound> - <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound> - <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1028_Mouboo.xml b/monsters/monster1028_Mouboo.xml deleted file mode 100644 index 07f585d1..00000000 --- a/monsters/monster1028_Mouboo.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1028" name="Mouboo"> - <sprite>monsters/mouboo.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1029_MauvePlant.xml b/monsters/monster1029_MauvePlant.xml deleted file mode 100644 index dd6a8c30..00000000 --- a/monsters/monster1029_MauvePlant.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1029" name="Mauve Plant"> - <sprite>monsters/plant.xml|#e0b0ff</sprite> - </monster> -</monsters> diff --git a/monsters/monster1030_CobaltPlant.xml b/monsters/monster1030_CobaltPlant.xml deleted file mode 100644 index 9f917665..00000000 --- a/monsters/monster1030_CobaltPlant.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1030" name="Cobalt Plant"> - <sprite>monsters/plant.xml|#0047ab</sprite> - </monster> -</monsters> diff --git a/monsters/monster1031_GambogePlant.xml b/monsters/monster1031_GambogePlant.xml deleted file mode 100644 index 382c3e4a..00000000 --- a/monsters/monster1031_GambogePlant.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1031" name="Gamboge Plant"> - <sprite>monsters/plant.xml|#ef9b0f</sprite> - </monster> -</monsters> diff --git a/monsters/monster1032_AlizarinPlant.xml b/monsters/monster1032_AlizarinPlant.xml deleted file mode 100644 index 995eceaf..00000000 --- a/monsters/monster1032_AlizarinPlant.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1032" name="Alizarin Plant"> - <sprite>monsters/plant.xml|#e32636</sprite> - </monster> -</monsters> diff --git a/monsters/monster1033_SeaSlime.xml b/monsters/monster1033_SeaSlime.xml deleted file mode 100644 index 7dcd65ea..00000000 --- a/monsters/monster1033_SeaSlime.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1033" name="Sea Slime"> - <sprite>monsters/slime.xml|#4ca1a0,ffffff</sprite> - <sprite>monsters/accessories/slime-seajelly.xml|#4Ca16e,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1034_GrassSnake.xml b/monsters/monster1034_GrassSnake.xml deleted file mode 100644 index b5319dfc..00000000 --- a/monsters/monster1034_GrassSnake.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1034" name="Grass Snake"> - <sprite>monsters/snake.xml|#205839,60a65d,80dba9,ffffff</sprite> - </monster> -</monsters> diff --git a/monsters/monster1035_Silkworm.xml b/monsters/monster1035_Silkworm.xml deleted file mode 100644 index 503f5516..00000000 --- a/monsters/monster1035_Silkworm.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1035" name="Silkworm"> - <sprite>monsters/silkworm.xml|#807d20,e0dac0;#c0a830</sprite> - </monster> -</monsters> diff --git a/monsters/monster1036_Zombie.xml b/monsters/monster1036_Zombie.xml deleted file mode 100644 index 554e4ca7..00000000 --- a/monsters/monster1036_Zombie.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1036" name="Zombie"> - <sprite>monsters/zombie.xml</sprite> - <sound event="move">monsters/zombie/zombie-move1.ogg</sound> - <sound event="move">monsters/zombie/zombie-move2.ogg</sound> - <sound event="hit">monsters/zombie/zombie-hit1.ogg</sound> - <sound event="hit">monsters/zombie/zombie-hit2.ogg</sound> - <sound event="miss">monsters/zombie/zombie-miss1.ogg</sound> - <sound event="die">monsters/zombie/zombie-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1037_CloverPatch.xml b/monsters/monster1037_CloverPatch.xml deleted file mode 100644 index 04cc5042..00000000 --- a/monsters/monster1037_CloverPatch.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1037" name="Clover Patch"> - <sprite>monsters/clover.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1038_Squirrel.xml b/monsters/monster1038_Squirrel.xml deleted file mode 100644 index 58f07602..00000000 --- a/monsters/monster1038_Squirrel.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1038" name="Squirrel"> - <sprite>monsters/squirrel.xml|#dfae76</sprite> - <sound event="hurt">monsters/squirrel/squirrel-hurt1.ogg</sound> - <sound event="hurt">monsters/squirrel/squirrel-hurt2.ogg</sound> - <sound event="die">monsters/squirrel/squirrel-die1.ogg</sound> - <sound event="die">monsters/squirrel/squirrel-die2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1039_FireLizard.xml b/monsters/monster1039_FireLizard.xml deleted file mode 100644 index b984c08f..00000000 --- a/monsters/monster1039_FireLizard.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1039" name="Fire Lizard"> - <sprite>monsters/lizard.xml|#673132,923F42,CD5961,E163A4,ffffff</sprite> - <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> - <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> - <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> - <attack id="1" effect-id="401"/> - </monster> -</monsters> diff --git a/monsters/monster1040_Wisp.xml b/monsters/monster1040_Wisp.xml deleted file mode 100644 index d9b8bfb6..00000000 --- a/monsters/monster1040_Wisp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1040" name="Wisp"> - <sprite>monsters/wisp.xml|#aadd44,ffff66</sprite> - <particlefx>graphics/particles/wisp.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1041_Snail.xml b/monsters/monster1041_Snail.xml deleted file mode 100644 index 41571b2c..00000000 --- a/monsters/monster1041_Snail.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1041" name="Snail"> - <sprite>monsters/snail.xml|#FDC689;#E0A6E3;#E0A6E3;#F06EAA;#C69C6D;#A9FF02</sprite> - <particlefx>graphics/particles/monster-snail-trail.particle.xml</particlefx> - <sound event="hit">monsters/snail/snail-hit1.ogg</sound> - <sound event="hurt">monsters/snail/snail-hurt1.ogg</sound> - <sound event="hurt">monsters/snail/snail-hurt1.ogg</sound> - <sound event="die">monsters/snail/snail-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1042_Spectre.xml b/monsters/monster1042_Spectre.xml deleted file mode 100644 index 95a68173..00000000 --- a/monsters/monster1042_Spectre.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1042" name="Spectre"> - <sprite>monsters/wisp.xml|#ff77dd,dd77ff</sprite> - <particlefx>graphics/particles/spectre.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1043_Skeleton.xml b/monsters/monster1043_Skeleton.xml deleted file mode 100644 index 4ee6ccb0..00000000 --- a/monsters/monster1043_Skeleton.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1043" name="Skeleton"> - <sprite>monsters/skeleton.xml|#ffe8bf</sprite> - <sound event="die">monsters/skeleton/skel-die1.ogg</sound> - <sound event="die">monsters/skeleton/skel-die2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> - <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1044_LadySkeleton.xml b/monsters/monster1044_LadySkeleton.xml deleted file mode 100644 index 35cd8bd6..00000000 --- a/monsters/monster1044_LadySkeleton.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1044" name="Lady Skeleton"> - <sprite>monsters/skeleton.xml|#ffe8bf</sprite> - <sprite>monsters/accessories/hairstyle08.xml|#ffe8bf</sprite> - <sound event="die">monsters/skeleton_lady/ladyskel-die1.ogg</sound> - <sound event="die">monsters/skeleton_lady/ladyskel-die2.ogg</sound> - <sound event="hit">monsters/skeleton_lady/ladyskel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton_lady/ladyskel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton_lady/ladyskel-hit3.ogg</sound> - <sound event="hurt">monsters/skeleton_lady/ladyskel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton_lady/ladyskel-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1045_Fallen.xml b/monsters/monster1045_Fallen.xml deleted file mode 100644 index c612517e..00000000 --- a/monsters/monster1045_Fallen.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1045" name="Fallen"> - <sprite>monsters/skeleton.xml|#ffe8bf</sprite> - <sprite>equipment/legs/chaps.xml</sprite> - <sprite>equipment/chest/warlordplate.xml</sprite> - <sprite>equipment/head/warlordhelm.xml</sprite> - <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> - <sound event="die">monsters/fallen/fallen-die1.ogg</sound> - <sound event="die">monsters/fallen/fallen-die2.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1046_TameScorpion.xml b/monsters/monster1046_TameScorpion.xml deleted file mode 100644 index 2c5973b0..00000000 --- a/monsters/monster1046_TameScorpion.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1046" name="Tame Scorpion"> - <sprite>monsters/scorpion.xml|#4d422d,826242,d8c282,ffffff</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1047_Poltergeist.xml b/monsters/monster1047_Poltergeist.xml deleted file mode 100644 index ef9ce3c7..00000000 --- a/monsters/monster1047_Poltergeist.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1047" name="Poltergeist"> - <sprite>monsters/wisp.xml|#77ffdd,77ddff</sprite> - <particlefx>graphics/particles/polter.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1048_Duck.xml b/monsters/monster1048_Duck.xml deleted file mode 100644 index ba4ff07b..00000000 --- a/monsters/monster1048_Duck.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1048" name="Duck" targetCursor="small"> - <sprite>monsters/duck.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1049_Bee.xml b/monsters/monster1049_Bee.xml deleted file mode 100644 index 2da9cd9c..00000000 --- a/monsters/monster1049_Bee.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1049" name="Bee" targetCursor="small"> - <sprite>monsters/bee.xml</sprite> - <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite> - <sound event="die">monsters/bee/bee-die1.ogg</sound> - <sound event="hit">monsters/bee/bee-hit1.ogg</sound> - <sound event="miss">monsters/bee/bee-miss1.ogg</sound> - <sound event="move">monsters/bee/bee-move1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1050_HouseMaggot.xml b/monsters/monster1050_HouseMaggot.xml deleted file mode 100644 index ac6b479f..00000000 --- a/monsters/monster1050_HouseMaggot.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1050" name="House Maggot" targetCursor="small"> - <sprite>monsters/cave-maggot.xml|#4d422d,826242,d8c282,ffffff</sprite> - <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> - <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> - <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> --> - <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1054_Troll.xml b/monsters/monster1054_Troll.xml deleted file mode 100644 index 26ff26cc..00000000 --- a/monsters/monster1054_Troll.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1054" name="Troll"> - <sprite>monsters/troll.xml|#FFDEC2;#FF4D4D;#FF99FF;#FFC88A</sprite> - <attack id="1" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" action="attack"/> - <sound event="hit">env/flame.ogg</sound> - <sound event="miss">env/flame.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1055_Butterfly.xml b/monsters/monster1055_Butterfly.xml deleted file mode 100644 index 6c0e92b1..00000000 --- a/monsters/monster1055_Butterfly.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1055" name="Butterfly" targetCursor="small"> - <sprite>monsters/butterfly.xml|#660000,FF3300,FFCC99,FFCCCC</sprite> - <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1056_CaveMaggot.xml b/monsters/monster1056_CaveMaggot.xml deleted file mode 100644 index 75deb799..00000000 --- a/monsters/monster1056_CaveMaggot.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1056" name="Cave Maggot" targetCursor="small"> - <sprite>monsters/cave-maggot.xml|</sprite> - <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> - <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> - <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> --> - <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1057_AngryScorpion.xml b/monsters/monster1057_AngryScorpion.xml deleted file mode 100644 index bdb81095..00000000 --- a/monsters/monster1057_AngryScorpion.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1057" name="Angry Scorpion"> - <sprite>monsters/scorpion.xml|#800000,ffffff</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1058_IceGoblin.xml b/monsters/monster1058_IceGoblin.xml deleted file mode 100644 index fcbce8a8..00000000 --- a/monsters/monster1058_IceGoblin.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1058" name="Ice Goblin"> - <sprite>monsters/goblin-ice.xml</sprite> - <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> - <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> - <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1059_GiantCaveMaggot.xml b/monsters/monster1059_GiantCaveMaggot.xml deleted file mode 100644 index 0f1a27f5..00000000 --- a/monsters/monster1059_GiantCaveMaggot.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1059" name="Giant Cave Maggot" targetCursor="large"> - <sprite>monsters/cave-maggot-giant.xml|#565051,ffffff</sprite> - <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> - <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> - <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> - <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1060_Archant.xml b/monsters/monster1060_Archant.xml deleted file mode 100644 index afc319db..00000000 --- a/monsters/monster1060_Archant.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1060" name="Archant"> - <sprite>monsters/archant.xml</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1061_Moggun.xml b/monsters/monster1061_Moggun.xml deleted file mode 100644 index 213a61ae..00000000 --- a/monsters/monster1061_Moggun.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1061" name="Moggun"> - <sprite>monsters/moggun.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1062_Terranite.xml b/monsters/monster1062_Terranite.xml deleted file mode 100644 index 25ab0551..00000000 --- a/monsters/monster1062_Terranite.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1062" name="Terranite"> - <sprite>monsters/terranite.xml</sprite> - <sound event="die">monsters/terranite/terra-die1.ogg</sound> - <sound event="hit">monsters/terranite/terra-hit1.ogg</sound> - <sound event="hit">monsters/terranite/terra-hit2.ogg</sound> - <sound event="hit">monsters/terranite/terra-hit3.ogg</sound> - <sound event="hurt">monsters/terranite/terra-hurt1.ogg</sound> - <sound event="hurt">monsters/terranite/terra-hurt2.ogg</sound> - <sound event="hurt">monsters/terranite/terra-hurt3.ogg</sound> - <sound event="miss">monsters/terranite/terra-miss1.ogg</sound> - <sound event="move">monsters/terranite/terra-move1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1063_Pumpkin.xml b/monsters/monster1063_Pumpkin.xml deleted file mode 100644 index 3228ea58..00000000 --- a/monsters/monster1063_Pumpkin.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1063" name="Pumpkin"> - <sprite>monsters/pumpkin.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1064_Bandit.xml b/monsters/monster1064_Bandit.xml deleted file mode 100644 index 6ff937f9..00000000 --- a/monsters/monster1064_Bandit.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1064" name="Bandit"> - <sprite>monsters/bandit.xml</sprite> - <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> - </monster> -</monsters> diff --git a/monsters/monster1065_BanditLord.xml b/monsters/monster1065_BanditLord.xml deleted file mode 100644 index 5342f3e6..00000000 --- a/monsters/monster1065_BanditLord.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1065" name="Bandit Lord"> - <sprite>monsters/bandit-lord.xml</sprite> - <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> - <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1066_VampireBat.xml b/monsters/monster1066_VampireBat.xml deleted file mode 100644 index 9e8cdd11..00000000 --- a/monsters/monster1066_VampireBat.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1066" name="Vampire Bat"> - <sprite>monsters/vampire-bat.xml</sprite> - <sound event="die">monsters/bat/bat-dying1.ogg</sound> - <sound event="hit">monsters/bat/bat-hit1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1067_Reaper.xml b/monsters/monster1067_Reaper.xml deleted file mode 100644 index b659c25b..00000000 --- a/monsters/monster1067_Reaper.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1067" name="Reaper"> - <sprite>monsters/reaper.xml</sprite> - <sprite>monsters/accessories/reaper-shadow.xml</sprite> - <particlefx>graphics/particles/monster-reaper.particle.xml</particlefx> - <sound event="die">monsters/reaper/reaper-die1.ogg</sound> - <sound event="hit">monsters/reaper/reaper-hit1.ogg</sound> - <sound event="hurt">monsters/reaper/reaper-hurt1.ogg</sound> - <sound event="move">monsters/reaper/reaper-move1.ogg</sound> - <attack id="1" critical-hit-effect-id="32" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1068_Reaper.xml b/monsters/monster1068_Reaper.xml deleted file mode 100644 index c53fbbf6..00000000 --- a/monsters/monster1068_Reaper.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1068" name="Reaper"> - <sprite>monsters/reaper.xml</sprite> - <sprite>monsters/accessories/reaper-shadow.xml</sprite> - <particlefx>graphics/particles/monster-reaper.particle.xml</particlefx> - <sound event="die">monsters/reaper/reaper-die1.ogg</sound> - <sound event="hit">monsters/reaper/reaper-hit1.ogg</sound> - <sound event="hurt">monsters/reaper/reaper-hurt1.ogg</sound> - <sound event="move">monsters/reaper/reaper-move1.ogg</sound> - <attack id="1" critical-hit-effect-id="32" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1069_Scythe.xml b/monsters/monster1069_Scythe.xml deleted file mode 100644 index d418219b..00000000 --- a/monsters/monster1069_Scythe.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1069" name="Flying Scythe" targetCursor="large"> - <sprite>monsters/spinning-scythe.xml</sprite> - <sprite>monsters/accessories/scythe-shadow.xml</sprite> - <sound event="die">monsters/scythe/scythe-die1.ogg</sound> - <sound event="hit">weapons/other/scythe/scythe-hit1.ogg</sound> - <sound event="hit">weapons/other/scythe/scythe-hit2.ogg</sound> - <sound event="hit">weapons/other/scythe/scythe-hit3.ogg</sound> - <sound event="move">monsters/scythe/move1.ogg</sound> - <sound event="move">monsters/scythe/move2.ogg</sound> - <sound event="move">monsters/scythe/move3.ogg</sound> - <sound event="sit">monsters/scythe/move1.ogg</sound> - <sound event="sit">monsters/scythe/move2.ogg</sound> - <sound event="sit">monsters/scythe/move3.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1070_BallLightning.xml b/monsters/monster1070_BallLightning.xml deleted file mode 100644 index 1ea3af9c..00000000 --- a/monsters/monster1070_BallLightning.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1070" name="Ball Lightning" targetCursor="small"> - <sprite>monsters/ball-lightning.xml</sprite> - <sprite>monsters/accessories/ball-lightning-shadow.xml</sprite> - <particlefx>graphics/particles/monster-ball-lightning.particle.xml</particlefx> - <sound event="move">monsters/ball_lightning/ball_lighning-move1.ogg</sound> - <sound event="die">env/zap.ogg</sound> - <attack id="1" hit-effect-id="23" miss-effect-id="23" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1071_IceElement.xml b/monsters/monster1071_IceElement.xml deleted file mode 100644 index 660b8944..00000000 --- a/monsters/monster1071_IceElement.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1071" name="Ice Element"> - <sprite>monsters/element-ball.xml|#5e929d,a2d8e3,ffffff</sprite> - </monster> -</monsters> diff --git a/monsters/monster1072_Yeti.xml b/monsters/monster1072_Yeti.xml deleted file mode 100644 index 09d702a6..00000000 --- a/monsters/monster1072_Yeti.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1072" name="Yeti"> - <sprite>monsters/yeti.xml</sprite> - <sound event="die">monsters/yeti/yeti-die1.ogg</sound> - <sound event="hit">monsters/yeti/yeti-hit1.ogg</sound> - <sound event="hit">monsters/yeti/yeti-hit2.ogg</sound> - <sound event="hit">monsters/yeti/yeti-hit3.ogg</sound> - <sound event="hit">monsters/yeti/yeti-hit4.ogg</sound> - <sound event="hurt">monsters/yeti/yeti-hurt1.ogg</sound> - <sound event="hurt">monsters/yeti/yeti-hurt2.ogg</sound> - <sound event="hurt">monsters/yeti/yeti-hurt3.ogg</sound> - <sound event="miss">monsters/yeti/yeti-miss1.ogg</sound> - <sound event="miss">monsters/yeti/yeti-miss2.ogg</sound> - <sound event="miss">monsters/yeti/yeti-miss3.ogg</sound> - <sound event="move">monsters/yeti/yeti-move1.ogg</sound> - <sound event="move">monsters/yeti/yeti-move2.ogg</sound> - <sound event="move">monsters/yeti/yeti-move3.ogg</sound> - <sound event="move">monsters/yeti/yeti-move4.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1073_TheLost.xml b/monsters/monster1073_TheLost.xml deleted file mode 100644 index cda9d5f7..00000000 --- a/monsters/monster1073_TheLost.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1073" name="The Lost"> - <sprite>monsters/skeleton.xml|#aca379</sprite> - <sprite>equipment/chest/robe.xml|#333333</sprite> - <sprite>equipment/head/phylactery.xml</sprite> - <sound event="die">monsters/skeleton/skel-die1.ogg</sound> - <sound event="die">monsters/skeleton/skel-die2.ogg</sound> - <sound event="hit">magic/confringo1.ogg</sound> - <sound event="hit">magic/confringo2.ogg</sound> - <sound event="hit">magic/confringo3.ogg</sound> - <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> - <attack id="1" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1074_RedBone.xml b/monsters/monster1074_RedBone.xml deleted file mode 100644 index 6a147e1a..00000000 --- a/monsters/monster1074_RedBone.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1074" name="Red Bone"> - <sprite>monsters/skeleton.xml|#994040,772020,440808,000000</sprite> - <sound event="die">monsters/skeleton/skel-die1.ogg</sound> - <sound event="die">monsters/skeleton/skel-die2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> - <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> - <particlefx>graphics/particles/necroblast.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1075_Stalker.xml b/monsters/monster1075_Stalker.xml deleted file mode 100644 index d8306b91..00000000 --- a/monsters/monster1075_Stalker.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1075" name="Stalker"> - <sprite>monsters/wraith.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1077_DrunkenSkeleton.xml b/monsters/monster1077_DrunkenSkeleton.xml deleted file mode 100644 index 2b0c8d99..00000000 --- a/monsters/monster1077_DrunkenSkeleton.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1077" name="Drunken Skeleton"> - <sprite>monsters/skeleton.xml|#ffe8bf</sprite> - <sprite>equipment/legs/chaps.xml</sprite> - <sprite>equipment/chest/vnecksweater.xml|#580000,A40000,C02020,ff6060</sprite> - <sprite>equipment/head/tophat.xml</sprite> - <sound event="die">monsters/skeleton/skel-die1.ogg</sound> - <sound event="die">monsters/skeleton/skel-die2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> - <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1078_TipsySkeleton.xml b/monsters/monster1078_TipsySkeleton.xml deleted file mode 100644 index 58e27d7d..00000000 --- a/monsters/monster1078_TipsySkeleton.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1078" name="Tipsy Skeleton"> - <sprite>monsters/skeleton.xml|#ffe8bf</sprite> - <sprite>equipment/legs/chaps.xml</sprite> - <sprite>equipment/chest/vnecksweater.xml|#0d1430,21337c,4363e5</sprite> - <sprite>equipment/head/bowler-hat.xml</sprite> - <sound event="die">monsters/skeleton/skel-die1.ogg</sound> - <sound event="die">monsters/skeleton/skel-die2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> - <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1079_DrunkenLadySkeleton.xml b/monsters/monster1079_DrunkenLadySkeleton.xml deleted file mode 100644 index 35825fcd..00000000 --- a/monsters/monster1079_DrunkenLadySkeleton.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1079" name="Drunken Lady Skeleton"> - <sprite>monsters/skeleton.xml|#ffe8bf</sprite> - <sprite>monsters/accessories/hairstyle08.xml|#ffe8bf</sprite> - <sprite>equipment/legs/skirt.xml|#3f221d,754d23,f5cea4</sprite> - <sprite>equipment/chest/shorttanktop.xml|#3f221d,754d23,f5cea4</sprite> - <sprite>equipment/head/heart-glasses.xml</sprite> - <sound event="die">monsters/skeleton_lady/ladyskel-die1.ogg</sound> - <sound event="die">monsters/skeleton_lady/ladyskel-die2.ogg</sound> - <sound event="hit">monsters/skeleton_lady/ladyskel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton_lady/ladyskel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton_lady/ladyskel-hit3.ogg</sound> - <sound event="hurt">monsters/skeleton_lady/ladyskel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton_lady/ladyskel-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1080_BlueSpark.xml b/monsters/monster1080_BlueSpark.xml deleted file mode 100644 index 4a26fae6..00000000 --- a/monsters/monster1080_BlueSpark.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1080" name="Blue Spark"> - <sprite>monsters/ball-lightning.xml</sprite> - <sprite>monsters/accessories/ball-lightning-shadow.xml</sprite> - <particlefx>graphics/particles/monster-ball-lightning-blue.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1081_RedSpark.xml b/monsters/monster1081_RedSpark.xml deleted file mode 100644 index 2f925153..00000000 --- a/monsters/monster1081_RedSpark.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1081" name="Red Spark"> - <sprite>monsters/ball-lightning.xml</sprite> - <sprite>monsters/accessories/ball-lightning-shadow.xml</sprite> - <particlefx>graphics/particles/monster-ball-lightning-red.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1082_Serqet.xml b/monsters/monster1082_Serqet.xml deleted file mode 100644 index 24ad95ec..00000000 --- a/monsters/monster1082_Serqet.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1082" name="Serqet"> - <sprite>monsters/serqet.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1083_HuntsmanSpider.xml b/monsters/monster1083_HuntsmanSpider.xml deleted file mode 100644 index 9df5223c..00000000 --- a/monsters/monster1083_HuntsmanSpider.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1083" name="Huntsman Spider"> - <sprite>monsters/spider.xml|#1a160f,93774a,d2c3aa,ffffff;#a00000</sprite> - <sound event="die">monsters/spider/spider-die1.ogg</sound> - <sound event="hit">monsters/spider/spider-hit1.ogg</sound> - <sound event="hit">monsters/spider/spider-hit2.ogg</sound> - <sound event="hit">monsters/spider/spider-hit3.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1084_CrotcherScorpion.xml b/monsters/monster1084_CrotcherScorpion.xml deleted file mode 100644 index 689ff738..00000000 --- a/monsters/monster1084_CrotcherScorpion.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1084" name="Crotcher Scorpion"> - <sprite>monsters/scorpion.xml|#211b0e,5c3e20,a68d42,ffffff</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1085_IceSkull.xml b/monsters/monster1085_IceSkull.xml deleted file mode 100644 index e4110c8d..00000000 --- a/monsters/monster1085_IceSkull.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1085" name="Ice Skull"> - <sprite>monsters/skull-ice.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1086_FeyElement.xml b/monsters/monster1086_FeyElement.xml deleted file mode 100644 index 8ed165f0..00000000 --- a/monsters/monster1086_FeyElement.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1086" name="Fey Element"> - <sprite>monsters/element-ball.xml|#6d4e2f,98612c,c38a53,ffffff</sprite> - <particlefx>graphics/particles/monster-leaf.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1087_Larvern.xml b/monsters/monster1087_Larvern.xml deleted file mode 100644 index 8e2b3055..00000000 --- a/monsters/monster1087_Larvern.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1087" name="Larvern" targetCursor="small"> - <sprite>monsters/larvespa.xml|#211b0e,5c3e20,a68d42;#667C26</sprite> - </monster> -</monsters> diff --git a/monsters/monster1088_Hyvern.xml b/monsters/monster1088_Hyvern.xml deleted file mode 100644 index 7f4e3c59..00000000 --- a/monsters/monster1088_Hyvern.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1088" name="Hyvern"> - <sprite>monsters/vespa.xml|#1a160f,93774a;#DEBFBF,BBA2A2</sprite> - </monster> -</monsters> diff --git a/monsters/monster1089_HungryFluffy.xml b/monsters/monster1089_HungryFluffy.xml deleted file mode 100644 index 99b1e7b4..00000000 --- a/monsters/monster1089_HungryFluffy.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1089" name="Hungry Fluffy"> - <sprite>monsters/fluffy.xml</sprite> - <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound> - <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound> - <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound> - <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound> - <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1090_Wolvern.xml b/monsters/monster1090_Wolvern.xml deleted file mode 100644 index be703b54..00000000 --- a/monsters/monster1090_Wolvern.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1090" name="Wolvern"> - <sprite>monsters/wolvern.xml|#000000,64727a,8996a0,a6afbf,dce9f3,ffffff</sprite> - <sound event="hit">monsters/wolvern/wolvern-hit1.ogg</sound> - <sound event="hit">monsters/wolvern/wolvern-hit2.ogg</sound> - <sound event="miss">monsters/wolvern/wolvern-miss1.ogg</sound> - <sound event="miss">monsters/wolvern/wolvern-miss2.ogg</sound> - <sound event="miss">monsters/wolvern/wolvern-miss3.ogg</sound> - <sound event="die">monsters/wolvern/wolvern-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1091_BlueSlime.xml b/monsters/monster1091_BlueSlime.xml deleted file mode 100644 index e6c30ae4..00000000 --- a/monsters/monster1091_BlueSlime.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1091" name="Blue Slime"> - <sprite>monsters/slime.xml|#2121ae,ffffff</sprite> - <sprite>monsters/accessories/slime-littleslime.xml|#2121ae,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1092_SlimeBlast.xml b/monsters/monster1092_SlimeBlast.xml deleted file mode 100644 index e7acb679..00000000 --- a/monsters/monster1092_SlimeBlast.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1092" name="Slime Blast"> - <sprite>monsters/accessories/slime-slimeblast.xml|#2121ae,ffffff</sprite> - <sound event="die">monsters/slime/slime-hit1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1093_WhiteSlime.xml b/monsters/monster1093_WhiteSlime.xml deleted file mode 100644 index 2f27dd6a..00000000 --- a/monsters/monster1093_WhiteSlime.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1093" name="White Slime"> - <sprite>monsters/accessories/slime-slimeblast.xml|#dcdcff,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1094_Reinboo.xml b/monsters/monster1094_Reinboo.xml deleted file mode 100644 index 5d2910fc..00000000 --- a/monsters/monster1094_Reinboo.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1094" name="Reinboo"> - <sprite>monsters/christmas-mouboo.xml</sprite> - <sprite>monsters/accessories/mouboo-red-nose.xml</sprite> - <sprite>monsters/accessories/mouboo-red-saddle.xml</sprite> - <sprite>monsters/accessories/mouboo-red-shoes.xml</sprite> - <sprite>monsters/accessories/mouboo-antlers.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1095_WhiteBell.xml b/monsters/monster1095_WhiteBell.xml deleted file mode 100644 index c2083eb7..00000000 --- a/monsters/monster1095_WhiteBell.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1095" name="White Bell"> - <sprite>monsters/snowflower.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1096_SoulSnake.xml b/monsters/monster1096_SoulSnake.xml deleted file mode 100644 index 02a772a2..00000000 --- a/monsters/monster1096_SoulSnake.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1096" name="Soul Snake"> - <sprite>monsters/snake.xml|#664d28,a6673a,86D6DB,ffffff</sprite> - <particlefx>graphics/particles/monster-soulsnake.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1097_SoulEater.xml b/monsters/monster1097_SoulEater.xml deleted file mode 100644 index c3378425..00000000 --- a/monsters/monster1097_SoulEater.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1097" name="Soul Eater"> - <sprite>monsters/skeleton.xml|#D9BFFF</sprite> - <sprite>equipment/chest/tanktop.xml|#333333,555555,444444</sprite> - <sprite>equipment/legs/shorts.xml|#333333,555555,444444</sprite> - <sprite>monsters/accessories/hairstyle05.xml|#333333</sprite> - <sound event="die">monsters/skeleton/skel-die1.ogg</sound> - <sound event="die">monsters/skeleton/skel-die2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> - <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> - <particlefx>graphics/particles/monster-souleater.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1098_CopperSlime.xml b/monsters/monster1098_CopperSlime.xml deleted file mode 100644 index ee07e153..00000000 --- a/monsters/monster1098_CopperSlime.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1098" name="Copper Slime"> - <sprite>monsters/slime.xml|#a1734c,ffffff</sprite> - <sprite>monsters/accessories/slime-seajelly.xml|#a1744c,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1099_SleepingBandit.xml b/monsters/monster1099_SleepingBandit.xml deleted file mode 100644 index 298ef29c..00000000 --- a/monsters/monster1099_SleepingBandit.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1099" name="Sleeping Bandit"> - <sprite>monsters/sleeping-bandit.xml</sprite> - <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> - </monster> -</monsters> diff --git a/monsters/monster1100_AzulSlime.xml b/monsters/monster1100_AzulSlime.xml deleted file mode 100644 index b9d4284d..00000000 --- a/monsters/monster1100_AzulSlime.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1100" name="Azul Slime"> - <sprite>monsters/slime-littleslime.xml|#3080e4,d2f4ff</sprite> - <sound event="die">monsters/slime/slime-hit1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1101_DemonicSpirit.xml b/monsters/monster1101_DemonicSpirit.xml deleted file mode 100644 index 650bca58..00000000 --- a/monsters/monster1101_DemonicSpirit.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1101" name="Demonic Spirit"> - <sprite>monsters/spirit-demonic.xml|#444444,9933ff</sprite> - </monster> -</monsters> diff --git a/monsters/monster1102_Luvia.xml b/monsters/monster1102_Luvia.xml deleted file mode 100644 index 624fef67..00000000 --- a/monsters/monster1102_Luvia.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1102" name="Luvia"> - <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#8c6625,dab425,ffffff</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> - <sprite>equipment/chest/sorcerer-robe-female.xml|#121212,343434;#8F47D6</sprite> - <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite> - <sound event="die">system/boom.ogg</sound> - <sound event="hit">magic/confringo1.ogg</sound> - <sound event="hit">magic/confringo2.ogg</sound> - <sound event="hit">magic/confringo3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx> - <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/luvia-attack.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1103_WitchGuard.xml b/monsters/monster1103_WitchGuard.xml deleted file mode 100644 index 934cf7e5..00000000 --- a/monsters/monster1103_WitchGuard.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1103" name="Witch Guard"> - <sprite>monsters/demon.xml|#444444,979797</sprite> - <sprite>equipment/feet/warlordboots.xml|#333333,878787</sprite> - <sprite>equipment/hands/generic.xml|#242424,626262</sprite> - <sprite>equipment/chest/demonwarlordplate.xml|#444444,979797</sprite> - <sprite>equipment/head/bull.xml</sprite> - <sprite>equipment/weapons/dagger.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0</sprite> - <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1104_DemonicMouboo.xml b/monsters/monster1104_DemonicMouboo.xml deleted file mode 100644 index f47a78b2..00000000 --- a/monsters/monster1104_DemonicMouboo.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1104" name="Demonic Mouboo"> - <sprite>monsters/mouboo-demonic.xml</sprite> - <sprite>monsters/accessories/mouboo-demonic-antlers.xml</sprite> - <particlefx>graphics/particles/monster-mouboo-demonic.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1105_ViciousSquirrel.xml b/monsters/monster1105_ViciousSquirrel.xml deleted file mode 100644 index 919fb588..00000000 --- a/monsters/monster1105_ViciousSquirrel.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1105" name="Vicious Squirrel"> - <sprite>monsters/squirrel.xml|#736443</sprite> - <sound event="hurt">monsters/squirrel/squirrel-hurt1.ogg</sound> - <sound event="hurt">monsters/squirrel/squirrel-hurt2.ogg</sound> - <sound event="die">monsters/squirrel/squirrel-die1.ogg</sound> - <sound event="die">monsters/squirrel/squirrel-die2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1106_WickedMushroom.xml b/monsters/monster1106_WickedMushroom.xml deleted file mode 100644 index 2322a9ce..00000000 --- a/monsters/monster1106_WickedMushroom.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1106" name="Wicked Mushroom"> - <sprite>monsters/mushroom-wicked.xml</sprite> - <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> - <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> - <sound event="die">monsters/shroom/shroom-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1107_Bluepar.xml b/monsters/monster1107_Bluepar.xml deleted file mode 100644 index 0909a244..00000000 --- a/monsters/monster1107_Bluepar.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1107" name="Bluepar" targetCursor="small"> - <sprite>monsters/bluepar.xml</sprite> - <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound> - <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1108_AngryFireGoblin.xml b/monsters/monster1108_AngryFireGoblin.xml deleted file mode 100644 index 6efb6a95..00000000 --- a/monsters/monster1108_AngryFireGoblin.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1108" name="Angry Fire Goblin"> - <sprite>monsters/goblin-fire.xml</sprite> - <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound> - <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound> - <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound> - <particlefx>graphics/particles/monster-angry-fire-goblin.particle.xml</particlefx> - <attack id="1" effect-id="400"/> - </monster> -</monsters> diff --git a/monsters/monster1109_AngrySeaSlime.xml b/monsters/monster1109_AngrySeaSlime.xml deleted file mode 100644 index 54205bbd..00000000 --- a/monsters/monster1109_AngrySeaSlime.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1109" name="Angry Sea Slime"> - <sprite>monsters/slime.xml|#4ca1a0,ffffff</sprite> - <sprite>monsters/accessories/slime-seajelly.xml|#4Ca16e,ffffff</sprite> - <particlefx>graphics/particles/monster-angry-sea-slime.particle.xml</particlefx> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1110_AngryGreenSlime.xml b/monsters/monster1110_AngryGreenSlime.xml deleted file mode 100644 index b40bd6a1..00000000 --- a/monsters/monster1110_AngryGreenSlime.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1110" name="Angry Green Slime"> - <sprite>monsters/slime.xml|#72982c,ffffff</sprite> - <particlefx>graphics/particles/monster-angry-green-slime.particle.xml</particlefx> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1111_CandiedSlime.xml b/monsters/monster1111_CandiedSlime.xml deleted file mode 100644 index 550f1ae6..00000000 --- a/monsters/monster1111_CandiedSlime.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1111" name="Candied Slime"> - <sprite>monsters/slime.xml|#fd2273,ffbeff,ffffff</sprite> - <sprite>monsters/accessories/slime-bubble.xml|#feaaa7,fdfffb</sprite> - <attack id="1" missile-particle="graphics/particles/peppermint.particle.xml" action="attack"/> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1112_Santaboo.xml b/monsters/monster1112_Santaboo.xml deleted file mode 100644 index 48c4ea6e..00000000 --- a/monsters/monster1112_Santaboo.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1112" name="Santaboo"> - <sprite>monsters/christmas-mouboo.xml</sprite> - <sprite>monsters/accessories/mouboo-red-nose.xml</sprite> - <sprite>monsters/accessories/mouboo-red-saddle.xml</sprite> - <sprite>monsters/accessories/mouboo-red-shoes.xml</sprite> - <sprite>monsters/accessories/mouboo-santa-hat.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1113_Pollett.xml b/monsters/monster1113_Pollett.xml deleted file mode 100644 index 55cfa9c1..00000000 --- a/monsters/monster1113_Pollett.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1113" name="Pollett"> - <sprite>monsters/penguin.xml</sprite> - <sound event="hit">monsters/pollett/pollett-hit1.ogg</sound> - <sound event="hit">monsters/pollett/pollett-hit2.ogg</sound> - <sound event="hit">monsters/pollett/pollett-hit3.ogg</sound> - <sound event="hit">monsters/pollett/pollett-hit4.ogg</sound> - <sound event="hurt">monsters/pollett/pollett-hurt1.ogg</sound> - <sound event="hurt">monsters/pollett/pollett-hurt2.ogg</sound> - <sound event="hurt">monsters/pollett/pollett-hurt3.ogg</sound> - <sound event="hurt">monsters/pollett/pollett-hurt4.ogg</sound> - <sound event="hurt">monsters/pollett/pollett-hurt5.ogg</sound> - <sound event="hurt">monsters/pollett/pollett-hurt6.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1114_NutCracker.xml b/monsters/monster1114_NutCracker.xml deleted file mode 100644 index c9eca78d..00000000 --- a/monsters/monster1114_NutCracker.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1114" name="Nut Cracker"> - <sprite>monsters/nutcracker.xml</sprite> - <sprite>monsters/accessories/hairstyle07.xml|#333333</sprite> - <sprite>monsters/accessories/nutcrackerhat.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1115_SeaSlimeMother.xml b/monsters/monster1115_SeaSlimeMother.xml deleted file mode 100644 index c0fafcb6..00000000 --- a/monsters/monster1115_SeaSlimeMother.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1115" name="Sea Slime Mother"> - <sprite>monsters/slime-mother.xml|#4ca1a0,ffffff</sprite> - <sprite>monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#4Ca16e,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - <attack id="1" missile-particle="graphics/particles/arrowh-sea-slime.particle.xml|#4Ca16e,ffffff" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1116_UndeadWitch.xml b/monsters/monster1116_UndeadWitch.xml deleted file mode 100644 index fdead204..00000000 --- a/monsters/monster1116_UndeadWitch.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1116" name="Undead Witch"> - <sprite>monsters/skeleton.xml|#ffe8bf</sprite> - <sprite>monsters/accessories/hairstyle08.xml</sprite> - <sprite>equipment/head/witch-hat.xml</sprite> - <sprite>equipment/chest/sorcerer-robe.xml|#111111,222222,333333,444444,555555,aaaaaa;#EFEFEF</sprite> - <sprite>equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> - <sound event="die">monsters/skeleton_lady/ladyskel-die1.ogg</sound> - <sound event="die">monsters/skeleton_lady/ladyskel-die2.ogg</sound> - <sound event="hit">magic/confringo1.ogg</sound> - <sound event="hit">magic/confringo2.ogg</sound> - <sound event="hit">magic/confringo3.ogg</sound> - <sound event="hurt">monsters/skeleton_lady/ladyskel-hurt1.ogg</sound> - <sound event="miss">weapons/other/staff/staff-miss1.ogg</sound> - <sound event="miss">weapons/other/staff/staff-miss2.ogg</sound> - <sound event="miss">weapons/other/staff/staff-miss3.ogg</sound> - <attack id="1" missile-particle="graphics/particles/undead-witch-attack.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1117_UndeadTroll.xml b/monsters/monster1117_UndeadTroll.xml deleted file mode 100644 index 0675078c..00000000 --- a/monsters/monster1117_UndeadTroll.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1117" name="Undead Troll"> - <sprite>monsters/troll.xml|#BFBFBF;#F1F1F1;#FF99FF;#F1F1F1</sprite> - <attack id="1" missile-particle="graphics/particles/monster-undeadtroll-foefire.particle.xml" action="attack"/> - <sound event="hit">env/flame.ogg</sound> - <sound event="miss">env/flame.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1118_GreenSlimeMother.xml b/monsters/monster1118_GreenSlimeMother.xml deleted file mode 100644 index 0b9bd379..00000000 --- a/monsters/monster1118_GreenSlimeMother.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1118" name="Green Slime Mother"> - <sprite>monsters/slime-mother.xml|#72982c,ffffff</sprite> - <sprite>monsters/accessories/slime-covered-bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;#72982c,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - <attack id="1" missile-particle="graphics/particles/arrowh-green-slime.particle.xml|#72982c,ffffff" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1119_Thug.xml b/monsters/monster1119_Thug.xml deleted file mode 100644 index 175e84a0..00000000 --- a/monsters/monster1119_Thug.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1119" name="Thug"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> - <sprite>equipment/head/sailor-hat.xml</sprite> - <sprite>equipment/feet/boots.xml</sprite> - <sprite>equipment/chest/tanktop.xml</sprite> - <sprite>equipment/legs/pants.xml</sprite> - <sound event="die">env/spawn_burst.ogg</sound> - <sound event="hit">weapons/punch1.ogg</sound> - <sound event="hit">weapons/punch2.ogg</sound> - <sound event="hit">weapons/punch3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1120_Swashbuckler.xml b/monsters/monster1120_Swashbuckler.xml deleted file mode 100644 index 5acffb76..00000000 --- a/monsters/monster1120_Swashbuckler.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1120" name="Swashbuckler"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> - <sprite>equipment/chest/vnecksweater.xml</sprite> - <sprite>equipment/legs/pants.xml|#212121,555555</sprite> - <sprite>equipment/head/bandana.xml|#212121,555555</sprite> - <sprite>equipment/feet/boots.xml|#212121,555555</sprite> - <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> - <sound event="die">system/spawn_burst.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1121_Grenadier.xml b/monsters/monster1121_Grenadier.xml deleted file mode 100644 index 50e6872a..00000000 --- a/monsters/monster1121_Grenadier.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1121" name="Grenadier"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> - <sprite>equipment/chest/sorcerer-robe.xml|#5178a0,1a294c;#d5b02c</sprite> - <sprite>equipment/legs/pants.xml|#5178a0,1a294c</sprite> - <sprite>equipment/head/piratehat.xml</sprite> - <sprite>equipment/hands/generic.xml</sprite> - <sprite>equipment/feet/boots.xml|#212121,444444</sprite> - <sound event="die">env/spawn_burst.ogg</sound> - <sound event="hit">system/crit.ogg</sound> - <sound event="miss">system/crit.ogg</sound> - <attack id="1" critical-hit-effect-id="30" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1122_TheDreadPirateMarley.xml b/monsters/monster1122_TheDreadPirateMarley.xml deleted file mode 100644 index 83e66e32..00000000 --- a/monsters/monster1122_TheDreadPirateMarley.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1122" name="The Dread Pirate Marley"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> - <sprite>equipment/chest/assassin.xml</sprite> - <sprite>equipment/legs/assassin.xml</sprite> - <sprite>equipment/head/eyepatch.xml</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> - <sound event="die">env/spawn_burst.ogg</sound> - <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> - <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> - <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1123_TheDreadPirateMarley.xml b/monsters/monster1123_TheDreadPirateMarley.xml deleted file mode 100644 index a4135a8e..00000000 --- a/monsters/monster1123_TheDreadPirateMarley.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1123" name="The Dread Pirate Marley"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#36e2fc,0ba8bf,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle00-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000</sprite> - <sprite>equipment/chest/assassin.xml</sprite> - <sprite>equipment/legs/assassin.xml</sprite> - <sprite>equipment/head/eyepatch.xml</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> - <sound event="die">env/spawn_burst.ogg</sound> - <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> - <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> - <attack id="1" missile-particle="graphics/particles/arrow.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1124_Wight.xml b/monsters/monster1124_Wight.xml deleted file mode 100644 index a015079c..00000000 --- a/monsters/monster1124_Wight.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1124" name="Wight"> - <sprite>monsters/skeleton_inv.xml|#497ac3,2053a0,164995,154387</sprite> - <sprite>monsters/wight.xml|#164489,1f529f,619aea</sprite> - <sound event="die">monsters/skeleton/skel-die1.ogg</sound> - <sound event="die">monsters/skeleton/skel-die2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> - <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> - <particlefx>graphics/particles/chillfog.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1125_ManaGhost.xml b/monsters/monster1125_ManaGhost.xml deleted file mode 100644 index f711bfa7..00000000 --- a/monsters/monster1125_ManaGhost.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1125" name="Mana Ghost"> - <sprite>monsters/mana-ghost.xml</sprite> - <sound event="die">monsters/ghost/ghost-die1.ogg</sound> - <sound event="move">monsters/ghost/ghost-move1.ogg</sound> - <sound event="move">monsters/ghost/ghost-move2.ogg</sound> - <sound event="move">monsters/ghost/ghost-move3.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1126_PsiBrain.xml b/monsters/monster1126_PsiBrain.xml deleted file mode 100644 index 017a989a..00000000 --- a/monsters/monster1126_PsiBrain.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1126" name="Psi-Brain"> - <sprite>monsters/psi-brain.xml</sprite> - <sprite>monsters/psi-bubble.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1127_GeneralKrukan.xml b/monsters/monster1127_GeneralKrukan.xml deleted file mode 100644 index 67c6b11f..00000000 --- a/monsters/monster1127_GeneralKrukan.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1127" name="General Krukan"> - <sprite>monsters/skeleton.xml|#ffe8bf</sprite> - <sprite>equipment/legs/chaps.xml</sprite> - <sprite>equipment/chest/warlordplate.xml</sprite> - <sprite>equipment/head/dark-helm.xml</sprite> - <sound event="die">monsters/fallen/fallen-die2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit1.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit2.ogg</sound> - <sound event="hit">monsters/skeleton/skel-hit3.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1128_GeneralRazha.xml b/monsters/monster1128_GeneralRazha.xml deleted file mode 100644 index 86434534..00000000 --- a/monsters/monster1128_GeneralRazha.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1128" name="General Razha"> - <sprite>monsters/demon.xml|#444444,979797</sprite> - <sprite>equipment/feet/warlordboots.xml|#333333,878787</sprite> - <sprite>equipment/hands/generic.xml|#242424,626262</sprite> - <sprite>equipment/chest/demonwarlordplate.xml|#ea0000,979797</sprite> - <sprite>equipment/head/underworld-mask.xml</sprite> - <sprite>equipment/weapons/dagger.xml|#181619,1c1b00,1b1a31,54438a,5b5660,827e85,9596e0</sprite> - <sound event="die">monsters/fallen/fallen-die2.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> - <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt1.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt2.ogg</sound> - <sound event="hurt">monsters/fallen/fallen-hurt3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - <particlefx>graphics/particles/monster-witchguard.particle.xml</particlefx> - </monster> -</monsters> diff --git a/monsters/monster1129_GeneralTerogan.xml b/monsters/monster1129_GeneralTerogan.xml deleted file mode 100644 index d10848fa..00000000 --- a/monsters/monster1129_GeneralTerogan.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1129" name="General Terogan"> - <sprite>monsters/skeleton.xml|#aca379</sprite> - <sprite>equipment/chest/robe.xml|#ea0000,333333</sprite> - <sprite>equipment/head/phylactery.xml</sprite> - <!-- <sprite>equipment/head/evileyes.xml</sprite> Commented due to missing frame errors, which cause lag. evileyes.xml needs rework --> - <sprite>equipment/hands/magefire.xml</sprite> - <sound event="die">monsters/fallen/fallen-die2.ogg</sound> - <sound event="hit">magic/confringo1.ogg</sound> - <sound event="hit">magic/confringo2.ogg</sound> - <sound event="hit">magic/confringo3.ogg</sound> - <sound event="hurt">monsters/skeleton/skel-hurt1.ogg</sound> - <sound event="miss">monsters/skeleton/skel-miss1.ogg</sound> - <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/thelost-attack.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1130_Moonshroom.xml b/monsters/monster1130_Moonshroom.xml deleted file mode 100644 index 65c9c35a..00000000 --- a/monsters/monster1130_Moonshroom.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1130" name="Moonshroom"> - <sprite>monsters/moonshroom.xml</sprite> - <particlefx>graphics/particles/monster-moonshroom.particle.xml</particlefx> - <attack id="1" missile-particle="graphics/particles/moonshroom-attack.particle.xml" action="attack"/> - <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> - <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> - <sound event="die">monsters/shroom/shroom-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1131_ManaBug.xml b/monsters/monster1131_ManaBug.xml deleted file mode 100644 index 1c81fb8e..00000000 --- a/monsters/monster1131_ManaBug.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1131" name="Mana Bug" targetCursor="small"> - <sprite>monsters/mana-bug.xml|#660000,FF3300,FFCC99,FFCCCC</sprite> - <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1132_LavaSlime.xml b/monsters/monster1132_LavaSlime.xml deleted file mode 100644 index 0032685d..00000000 --- a/monsters/monster1132_LavaSlime.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1132" name="Lava Slime"> - <sprite>monsters/slime.xml|#bb0201,ff9934,ffd366</sprite> - <particlefx>graphics/particles/firetrail.xml</particlefx> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - <attack id="1" critical-hit-effect-id="400" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1133_Anne.xml b/monsters/monster1133_Anne.xml deleted file mode 100644 index 4068ad2d..00000000 --- a/monsters/monster1133_Anne.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1133" name="Anne"> - <sprite>monsters/lizard.xml|#923F7C,6E5A8C,C1B5B6</sprite> - <sound event="hit">monsters/wolvern/wolvern-hit1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1134_SUSAN.xml b/monsters/monster1134_SUSAN.xml deleted file mode 100644 index adaf669c..00000000 --- a/monsters/monster1134_SUSAN.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1134" name="SUSAN" targetCursor="large"> - <sprite>monsters/SUSAN.xml|R:#ff00e4</sprite> - <particlefx>graphics/particles/heartnecklace.particle.xml</particlefx> - <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> - <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> - <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> - <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1135_LovelyMaggot.xml b/monsters/monster1135_LovelyMaggot.xml deleted file mode 100644 index 33349f72..00000000 --- a/monsters/monster1135_LovelyMaggot.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1135" name="Lovely Maggot" targetCursor="small"> - <sprite>monsters/lovely-maggot.xml|S:#524b51,8463a0,6f706f,af006d</sprite> - <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> - <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> - <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> --> - <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1136_LesserGhost.xml b/monsters/monster1136_LesserGhost.xml deleted file mode 100644 index def63655..00000000 --- a/monsters/monster1136_LesserGhost.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1136" name="Lesser Ghost"> - <sprite>monsters/mana-ghost.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1137_Tormenta.xml b/monsters/monster1137_Tormenta.xml deleted file mode 100644 index 81a41c22..00000000 --- a/monsters/monster1137_Tormenta.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1137" name="Tormenta"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle13-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> - <sprite>equipment/chest/sorcerer-robe.xml|#121212,343434;#8F47D6</sprite> - <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite> - <sound event="die">system/boom.ogg</sound> - <sound event="hit">magic/confringo1.ogg</sound> - <sound event="hit">magic/confringo2.ogg</sound> - <sound event="hit">magic/confringo3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx> - <particlefx>graphics/particles/soulpool.xml</particlefx> - <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/luvia-attack.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1138_ManaGuardian.xml b/monsters/monster1138_ManaGuardian.xml deleted file mode 100644 index 5c865fad..00000000 --- a/monsters/monster1138_ManaGuardian.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1138" name="Mana Guardian"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle08.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> - <sprite>equipment/chest/robe.xml|#ffffff</sprite> - <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> - <sprite>equipment/head/aureole.xml</sprite> - <sound event="hit">env/flame.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - <particlefx>graphics/particles/angel.particle.xml</particlefx> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1139_Virus.xml b/monsters/monster1139_Virus.xml deleted file mode 100644 index ba8067e0..00000000 --- a/monsters/monster1139_Virus.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1139" name="Virus"> - <sprite>monsters/virus.xml</sprite> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <attack id="1" missile-particle="graphics/particles/monster-virus-foefire.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1140_Tengu.xml b/monsters/monster1140_Tengu.xml deleted file mode 100644 index a9f91e91..00000000 --- a/monsters/monster1140_Tengu.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1140" name="Tengu"> - <sprite>monsters/tengu.xml</sprite> - <sound event="die">monsters/tengu/die1.ogg</sound> - <sound event="hit">monsters/tengu/hit1.ogg</sound> - <sound event="hit">monsters/tengu/hit2.ogg</sound> - <sound event="hit">monsters/tengu/hit3.ogg</sound> - <sound event="hurt">monsters/tengu/hurt1.ogg</sound> - <sound event="hurt">monsters/tengu/hurt2.ogg</sound> - <sound event="hurt">monsters/tengu/hurt3.ogg</sound> - <sound event="miss">monsters/tengu/miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1141_Sasquatch.xml b/monsters/monster1141_Sasquatch.xml deleted file mode 100644 index a75c5a17..00000000 --- a/monsters/monster1141_Sasquatch.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1141" name="Sasquatch"> - <sprite>monsters/sasquatch.xml</sprite> - <sound event="die">monsters/yeti/yeti-die1.ogg</sound> - <sound event="hit">monsters/yeti/yeti-hit1.ogg</sound> - <sound event="hit">monsters/yeti/yeti-hit2.ogg</sound> - <sound event="hit">monsters/yeti/yeti-hit3.ogg</sound> - <sound event="hit">monsters/yeti/yeti-hit4.ogg</sound> - <sound event="hurt">monsters/yeti/yeti-hurt1.ogg</sound> - <sound event="hurt">monsters/yeti/yeti-hurt2.ogg</sound> - <sound event="hurt">monsters/yeti/yeti-hurt3.ogg</sound> - <sound event="miss">monsters/yeti/yeti-miss1.ogg</sound> - <sound event="miss">monsters/yeti/yeti-miss2.ogg</sound> - <sound event="miss">monsters/yeti/yeti-miss3.ogg</sound> - <sound event="move">monsters/sasquatch/sasquatch-move1.ogg</sound> - <sound event="move">monsters/sasquatch/sasquatch-move1.ogg</sound> - <sound event="move">monsters/sasquatch/sasquatch-move1.ogg</sound> - <sound event="move">monsters/sasquatch/sasquatch-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1142_Kage.xml b/monsters/monster1142_Kage.xml deleted file mode 100644 index 441425bf..00000000 --- a/monsters/monster1142_Kage.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1142" name="Zax De'Kagen"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle06-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> - <sprite>equipment/chest/sorcerer-robe.xml|#121212,343434;#8F47D6</sprite> - <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite> - <sound event="die">system/boom.ogg</sound> - <sound event="hit">magic/confringo1.ogg</sound> - <sound event="hit">magic/confringo2.ogg</sound> - <sound event="hit">magic/confringo3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx> - <particlefx>graphics/particles/soulpool.xml</particlefx> - <particlefx>graphics/particles/angel.particle.xml</particlefx> - <sprite>equipment/head/katzeur.xml</sprite> - <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/luvia-attack.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1143_ManaSlayer.xml b/monsters/monster1143_ManaSlayer.xml deleted file mode 100644 index 7b03f694..00000000 --- a/monsters/monster1143_ManaSlayer.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1143" name="Mana Slayer"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle08.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> - <sprite>equipment/chest/robe.xml|#000000</sprite> - <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> - <sprite>equipment/head/aureole.xml</sprite> - <sprite>equipment/weapons/sandcutter.xml</sprite> - <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound> - <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1144_GreatDragon.xml b/monsters/monster1144_GreatDragon.xml deleted file mode 100644 index a9b0fa2e..00000000 --- a/monsters/monster1144_GreatDragon.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1144" name="Great Dragon"> - <sprite>monsters/dragon.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1145_Golem.xml b/monsters/monster1145_Golem.xml deleted file mode 100644 index 63d8e6ee..00000000 --- a/monsters/monster1145_Golem.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1145" name="Coal Golem"> - <sprite>monsters/golem.xml</sprite> - <!-- No folder for this --> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> - <sound event="die">monsters/golem/die.ogg</sound> - <sound event="hit">monsters/golem/hit1.ogg</sound> - <sound event="miss">monsters/golem/miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1146_Flashmob.xml b/monsters/monster1146_Flashmob.xml deleted file mode 100644 index 385379e5..00000000 --- a/monsters/monster1146_Flashmob.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1146" name="Flashmob"> - <sprite>model/base.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d55</sprite> - <sprite>hairstyles/hairstyle15.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/legs/assassin.xml</sprite> - <sprite>equipment/chest/bromenalchest.xml|#fbf5e9</sprite> - <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> - <sprite>equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_2hand"/> - <sound event="die">monsters/flashmob/flashmob-die1.ogg</sound> - <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound> - <sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound> - <sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound> - <sound event="miss">weapons/other/staff/staff-miss1.ogg</sound> - <sound event="miss">weapons/other/staff/staff-miss2.ogg</sound> - <sound event="miss">weapons/other/staff/staff-miss3.ogg</sound> - <sound event="hurt">monsters/flashmob/flashmob-hurt1.ogg</sound> - <sound event="hurt">monsters/flashmob/flashmob-hurt2.ogg</sound> - <sound event="hurt">monsters/flashmob/flashmob-hurt3.ogg</sound> - <sound event="move">monsters/flashmob/flashmob-move1.ogg</sound> - <sound event="move">monsters/flashmob/flashmob-move2.ogg</sound> - <sound event="move">monsters/flashmob/flashmob-move3.ogg</sound> - <sound event="move">monsters/flashmob/flashmob-move4.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1147_Koyntety.xml b/monsters/monster1147_Koyntety.xml deleted file mode 100644 index a8c3d310..00000000 --- a/monsters/monster1147_Koyntety.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1147" name="Koyntety"> - <sprite>model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle09-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots-female.xml</sprite> - <sprite>equipment/legs/assassin-female.xml</sprite> - <sprite>equipment/chest/bromenalchest-female.xml|#fbf5e9</sprite> - <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> - <sprite>equipment/weapons/bow-female.xml</sprite> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_bow"/> - <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> - <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1148_DoomGolem.xml b/monsters/monster1148_DoomGolem.xml deleted file mode 100644 index e1b8027a..00000000 --- a/monsters/monster1148_DoomGolem.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1148" name="Doom Golem"> - <sprite>monsters/golem-red.xml</sprite> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> - <sound event="die">monsters/golem/die.ogg</sound> - <sound event="hit">monsters/golem/hit1.ogg</sound> - <sound event="miss">monsters/golem/miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1149_TheEnchanter.xml b/monsters/monster1149_TheEnchanter.xml deleted file mode 100644 index adf72c60..00000000 --- a/monsters/monster1149_TheEnchanter.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1149" name="The Enchanter"> - <sprite>model/female.xml|#413e22,6c5d31,baa06e,b2b05f;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle09-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots-female.xml</sprite> - <sprite>equipment/legs/assassin-female.xml</sprite> - <sprite>equipment/chest/sorcerer-robe-female.xml|#000000;#2554c7</sprite> - <!-- No folder for this --> - <sprite>equipment/weapons/bow-female.xml</sprite> - <particlefx>graphics/particles/doom.particle.xml</particlefx> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack_bow"/> - <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> - <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1150_ManaTyrant.xml b/monsters/monster1150_ManaTyrant.xml deleted file mode 100644 index eb8e0170..00000000 --- a/monsters/monster1150_ManaTyrant.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1150" name="Mana Tyrant"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle08.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> - <sprite>equipment/chest/robe.xml|#5e7480,f1ffff,ffffff</sprite> - <sprite>equipment/chest/warlordplate.xml</sprite> - <sprite>equipment/head/knighthelm.xml</sprite> - <!-- No folder for this --> - <sprite>equipment/angel-wings.xml</sprite> - <sprite>equipment/head/aureole.xml</sprite> - <sound event="hit">weapons/punch1.ogg</sound> - <sound event="hit">weapons/punch2.ogg</sound> - <sound event="hit">weapons/punch3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - <particlefx>graphics/particles/angel.particle.xml</particlefx> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1151_VoidFlower.xml b/monsters/monster1151_VoidFlower.xml deleted file mode 100644 index 7f523aaf..00000000 --- a/monsters/monster1151_VoidFlower.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1151" name="V0id Flower"> - <sprite>monsters/flower.xml|#f08808,e06808;#f6ffbd;#23285f</sprite> - <sound event="hit">monsters/flower/flower-hit1.ogg</sound> - <sound event="hit">monsters/flower/flower-hit2.ogg</sound> - <sound event="miss">monsters/flower/flower-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1152_VoidArchant.xml b/monsters/monster1152_VoidArchant.xml deleted file mode 100644 index e0fac6e4..00000000 --- a/monsters/monster1152_VoidArchant.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1152" name="V0id Archant"> - <sprite>monsters/archant.xml</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1153_VoidSlime.xml b/monsters/monster1153_VoidSlime.xml deleted file mode 100644 index b2fcf268..00000000 --- a/monsters/monster1153_VoidSlime.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1153" name="V0id Slime"> - <sprite>monsters/slime.xml|#fc6e00,ffffff</sprite> - <sprite>monsters/accessories/slime-seajelly.xml|#ffaa00,ffffff</sprite> - <sound event="die">monsters/slime/slime-die1.ogg</sound> - <sound event="hit">monsters/slime/slime-hit1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt1.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt2.ogg</sound> - <sound event="hurt">monsters/slime/slime-hurt3.ogg</sound> - <sound event="move">monsters/slime/slime-move1.ogg</sound> - <sound event="move">monsters/slime/slime-move2.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1154_VoidSnake.xml b/monsters/monster1154_VoidSnake.xml deleted file mode 100644 index 83791e8c..00000000 --- a/monsters/monster1154_VoidSnake.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1154" name="V0id Snake"> - <sprite>monsters/snake.xml|#151515,505050,e02020;#a01010;#ffffff</sprite> - <sound event="hit">monsters/cavesnake/cavesnake-hit1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1155_VoidBat.xml b/monsters/monster1155_VoidBat.xml deleted file mode 100644 index f25b03df..00000000 --- a/monsters/monster1155_VoidBat.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1155" name="V0id Bat"> - <sprite>monsters/crafty.xml</sprite> - <sound event="die">monsters/bat/bat-dying1.ogg</sound> - <sound event="hit">monsters/bat/bat-hit1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1156_VoidMaggot.xml b/monsters/monster1156_VoidMaggot.xml deleted file mode 100644 index 6399c2a9..00000000 --- a/monsters/monster1156_VoidMaggot.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1156" name="V0id Maggot" targetCursor="small"> - <sprite>monsters/void-maggot.xml</sprite> - <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound> - <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound> - <!-- <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound> --> - <sound event="die">monsters/maggot/maggot-dying1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1157_VoidSoldier.xml b/monsters/monster1157_VoidSoldier.xml deleted file mode 100644 index a52f2029..00000000 --- a/monsters/monster1157_VoidSoldier.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1157" name="V0id Soldier"> - <sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite> - <sprite>equipment/feet/warlordboots.xml|#333333,878787</sprite> - <sprite>equipment/hands/generic.xml|#242424,626262</sprite> - <sprite>equipment/chest/warlordplate.xml|#444444,979797</sprite> - <sprite>equipment/head/bull.xml</sprite> - <sprite>equipment/weapons/bow-banshee.xml|#1c1b00,1b1a31,5b5660,827e85,9596e0</sprite> - <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound> - <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound> - <attack id="1" critical-hit-effect-id="28" missile-particle="graphics/particles/arrow.particle.xml" action="attack_bow"/> - </monster> -</monsters> diff --git a/monsters/monster1158_VoidMouboo.xml b/monsters/monster1158_VoidMouboo.xml deleted file mode 100644 index 0990bcf4..00000000 --- a/monsters/monster1158_VoidMouboo.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1158" name="V0id Mouboo"> - <sprite>monsters/moubi.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1159_VoidScorpion.xml b/monsters/monster1159_VoidScorpion.xml deleted file mode 100644 index bd591369..00000000 --- a/monsters/monster1159_VoidScorpion.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1159" name="V0id Scorpion"> - <sprite>monsters/scorpion.xml|#fc6e00,fa9a00,ffff00,ffffff</sprite> - <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound> - <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - <sound event="die">monsters/spider/spider-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1160_VoidShroom.xml b/monsters/monster1160_VoidShroom.xml deleted file mode 100644 index 8f735749..00000000 --- a/monsters/monster1160_VoidShroom.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1160" name="V0id Mushroom"> - <sprite>monsters/mushroom-void.xml</sprite> - <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound> - <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound> - <sound event="die">monsters/shroom/shroom-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1161_Xakelbael.xml b/monsters/monster1161_Xakelbael.xml deleted file mode 100644 index c44caa9b..00000000 --- a/monsters/monster1161_Xakelbael.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1161" name="Xakelbael the Dark"> - <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite> - <sprite>hairstyles/hairstyle06-male.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite> - <sprite>equipment/feet/assassin-boots.xml</sprite> - <sprite>equipment/legs/shorts.xml|#121212,343434</sprite> - <sprite>equipment/chest/sorcerer-robe.xml|#846928,dab641,ffef93,fff7c9;#8F47D6</sprite> - <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite> - <sound event="die">system/boom.ogg</sound> - <sound event="hit">magic/confringo1.ogg</sound> - <sound event="hit">magic/confringo2.ogg</sound> - <sound event="hit">magic/confringo3.ogg</sound> - <sound event="miss">weapons/miss1.ogg</sound> - <sound event="miss">weapons/miss2.ogg</sound> - <sound event="miss">weapons/miss3.ogg</sound> - <particlefx>graphics/particles/monster-luvia.particle.xml</particlefx> - <particlefx>graphics/particles/angel.particle.xml</particlefx> - <attack id="1" critical-hit-effect-id="42" missile-particle="graphics/particles/luvia-attack.particle.xml" action="attack"/> - </monster> -</monsters> diff --git a/monsters/monster1162_Grinchboo.xml b/monsters/monster1162_Grinchboo.xml deleted file mode 100644 index d638888e..00000000 --- a/monsters/monster1162_Grinchboo.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1162" name="Grinchboo"> - <sprite>monsters/grinchboo.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1163_FridayCat.xml b/monsters/monster1163_FridayCat.xml deleted file mode 100644 index dadc08b1..00000000 --- a/monsters/monster1163_FridayCat.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1163" name="Friday"> - <sprite>monsters/pet-black-cat.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1164_CristmasTree.xml b/monsters/monster1164_CristmasTree.xml deleted file mode 100644 index a54a4994..00000000 --- a/monsters/monster1164_CristmasTree.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1164" name="Christmas Tree"> - <sprite>npcs/christmastree.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1165_CristmasGift.xml b/monsters/monster1165_CristmasGift.xml deleted file mode 100644 index 40d2aadd..00000000 --- a/monsters/monster1165_CristmasGift.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1165" name="Christmas Gift"> - <sprite>monsters/presente-surpresa.xml</sprite> - </monster> -</monsters> diff --git a/monsters/monster1166_Snowman.xml b/monsters/monster1166_Snowman.xml deleted file mode 100644 index de7607cf..00000000 --- a/monsters/monster1166_Snowman.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1166" name="Snowman"> - <sprite>monsters/snowman.xml</sprite> - <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound> - <sound event="miss">weapons/projectiles/snowball/miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1167_SnowmanBoss.xml b/monsters/monster1167_SnowmanBoss.xml deleted file mode 100644 index 449999a5..00000000 --- a/monsters/monster1167_SnowmanBoss.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1167" name="Der Schneemann"> - <sprite>monsters/snowman-boss.xml</sprite> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/snow-burst.xml" action="attack"/> - <sound event="hit">monsters/snowman_boss/hit1.ogg</sound> - <sound event="miss">monsters/snowman_boss/miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1168_Floyd.xml b/monsters/monster1168_Floyd.xml deleted file mode 100644 index 32b7dd34..00000000 --- a/monsters/monster1168_Floyd.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1168" name="Floyd"> - <sprite>monsters/floyd.xml</sprite> - <sound event="hit">env/zap.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1169_CrystalSpider.xml b/monsters/monster1169_CrystalSpider.xml deleted file mode 100644 index 29a12a00..00000000 --- a/monsters/monster1169_CrystalSpider.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1169" name="Crystal Spider"> - <sprite>monsters/spider-crystal.xml</sprite> - <sound event="hit">monsters/spider/spider-hit1.ogg</sound> - <sound event="hit">monsters/spider/spider-hit2.ogg</sound> - <sound event="hit">monsters/spider/spider-hit3.ogg</sound> - <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> - <sound event="move">monsters/spider/spider-move1.ogg</sound> - <sound event="move">monsters/spider/spider-move2.ogg</sound> - <sound event="move">monsters/spider/spider-move3.ogg</sound> - <sound event="move">monsters/spider/spider-move4.ogg</sound> - <sound event="move">monsters/spider/spider-move5.ogg</sound> - <sound event="die">monsters/spider/spider-die1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1170_CrystalGolem.xml b/monsters/monster1170_CrystalGolem.xml deleted file mode 100644 index 7b8f5791..00000000 --- a/monsters/monster1170_CrystalGolem.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1170" name="Crystal Golem"> - <sprite>monsters/golem-crystal.xml</sprite> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> - <sound event="die">monsters/golem/die.ogg</sound> - <sound event="hit">monsters/golem/hit1.ogg</sound> - <sound event="miss">monsters/golem/miss1.ogg</sound> - </monster> -</monsters> diff --git a/monsters/monster1171_BlackCrystalGolem.xml b/monsters/monster1171_BlackCrystalGolem.xml deleted file mode 100644 index 51598021..00000000 --- a/monsters/monster1171_BlackCrystalGolem.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<monsters offset="0"> - <monster id="1171" name="Black Crystal Golem"> - <sprite>monsters/golem-blackcrystal.xml</sprite> - <attack id="1" critical-hit-effect-id="16" missile-particle="graphics/particles/fire-burst.xml" action="attack"/> - <sound event="die">monsters/golem/die.ogg</sound> - <sound event="hit">monsters/golem/hit1.ogg</sound> - <sound event="miss">monsters/golem/miss1.ogg</sound> - </monster> -</monsters> diff --git a/music b/music -Subproject cb1e2aecf4591727ab3f10af8a79aeb999b908f +Subproject feb739ae5b4385829985b28e9e8dd2f4281d73e @@ -7,6 +7,9 @@ <npc id="194"> <sprite>npcs/griffen-meway-gpl.xml</sprite> </npc> + <npc id="203"> + <sprite>npcs/blanc.xml</sprite> + </npc> <npc id="200"> <sprite variant="5">npcs/2006__npcs.xml</sprite> </npc> diff --git a/status-effects.xml b/status-effects.xml index cd08d2a7..a3c8c1c4 100644 --- a/status-effects.xml +++ b/status-effects.xml @@ -25,4 +25,5 @@ <status-effect name="spell-cooldown-ar" id="75" icon="icons/spell-cooldown-ar.xml"/> <status-effect name="spell-cooldown-ench" id="76" icon="icons/spell-cooldown-ench.xml"/> <status-effect name="spell-cooldown-koy" id="77" icon="icons/spell-cooldown-koy.xml"/> + <status-effect name="spell-cooldown-upmarmu" id="78" icon="icons/spell-cooldown-upmarmu.xml"/> </status-effects> diff --git a/tilesets/shipwreck_blanc.tsx b/tilesets/shipwreck_blanc.tsx new file mode 100644 index 00000000..b5542aeb --- /dev/null +++ b/tilesets/shipwreck_blanc.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset version="1.4" tiledversion="1.4.3" name="shipwreck_blanc" tilewidth="32" tileheight="32" tilecount="224" columns="16"> + <image source="../graphics/tiles/blanc.png" width="527" height="467"/> +</tileset> diff --git a/tilesets/woodland_village_x2_to_1x.tsx b/tilesets/woodland_village_x2_to_1x.tsx new file mode 100644 index 00000000..bbdbbd20 --- /dev/null +++ b/tilesets/woodland_village_x2_to_1x.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset version="1.9" tiledversion="1.9.2" name="woodland_village_x2_to_x1" tilewidth="32" tileheight="32" tilecount="32" columns="16"> + <image source="../graphics/tiles/woodland_village_x2.png" width="512" height="64"/> +</tileset> diff --git a/tilesets/woodland_x3_to_1x.tsx b/tilesets/woodland_x3_to_1x.tsx new file mode 100644 index 00000000..ed798eba --- /dev/null +++ b/tilesets/woodland_x3_to_1x.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset version="1.9" tiledversion="1.9.2" name="woodland_x3_to_x1" tilewidth="32" tileheight="32" tilecount="96" columns="16"> + <image source="../graphics/tiles/woodland_x3.png" width="512" height="192"/> +</tileset> |
