diff options
31 files changed, 648 insertions, 361 deletions
diff --git a/graphics/minimaps/009-1.png b/graphics/minimaps/009-1.png Binary files differindex 178a4223..2df74ddb 100644 --- a/graphics/minimaps/009-1.png +++ b/graphics/minimaps/009-1.png diff --git a/graphics/minimaps/031-1.png b/graphics/minimaps/031-1.png Binary files differindex ea5e43d3..5c0d7e83 100644 --- a/graphics/minimaps/031-1.png +++ b/graphics/minimaps/031-1.png diff --git a/graphics/sprites/equipment/head/assassin-mask-female.xml b/graphics/sprites/equipment/head/assassin-mask-female.xml new file mode 100644 index 00000000..fe2ddc52 --- /dev/null +++ b/graphics/sprites/equipment/head/assassin-mask-female.xml @@ -0,0 +1,229 @@ +<?xml version="1.0"?> +<sprite> + <imageset height="40" name="base" src="graphics/sprites/equipment/head/assassin-mask.png" width="40"/> + <action imageset="base" name="stand"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY="-29"/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="0" offsetY="-29"/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-1" offsetY="-25"/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="0" offsetY="-29"/> + </animation> + </action> + <action imageset="base" name="walk"> + <animation direction="down"> + <frame delay="75" index="0" offsetX="0" offsetY="-28"/> + <frame delay="150" index="0" offsetX="0" offsetY="-29"/> + <frame delay="75" index="0" offsetX="0" offsetY="-28"/> + <frame delay="150" index="0" offsetX="0" offsetY="-29"/> + </animation> + <animation direction="left"> + <frame delay="75" index="1" offsetX="0" offsetY="-29"/> + <frame delay="75" index="1" offsetX="0" offsetY="-28"/> + <frame delay="150" index="1" offsetX="0" offsetY="-29"/> + <frame delay="75" index="1" offsetX="0" offsetY="-28"/> + <frame delay="75" index="1" offsetX="0" offsetY="-29"/> + </animation> + <animation direction="up"> + <frame delay="75" index="2" offsetX="-1" offsetY="-25"/> + <frame delay="150" index="2" offsetX="-1" offsetY="-26"/> + <frame delay="75" index="2" offsetX="-1" offsetY="-25"/> + <frame delay="150" index="2" offsetX="-1" offsetY="-26"/> + </animation> + <animation direction="right"> + <frame delay="75" index="3" offsetX="0" offsetY="-29"/> + <frame delay="75" index="3" offsetX="0" offsetY="-28"/> + <frame delay="150" index="3" offsetX="0" offsetY="-29"/> + <frame delay="75" index="3" offsetX="0" offsetY="-28"/> + <frame delay="75" index="3" offsetX="0" offsetY="-29"/> + </animation> + </action> + <action imageset="base" name="attack"> + <animation direction="down"> + <frame delay="75" index="0" offsetX="0" offsetY="-27"/> + <frame delay="75" index="0" offsetX="0" offsetY="-28"/> + <frame delay="75" index="0" offsetX="0" offsetY="-25"/> + <frame delay="75" index="0" offsetX="0" offsetY="-24"/> + <end/> + </animation> + <animation direction="left"> + <frame delay="75" index="1" offsetX="4" offsetY="-30"/> + <frame delay="75" index="1" offsetX="4" offsetY="-31"/> + <frame delay="75" index="1" offsetX="0" offsetY="-28"/> + <frame delay="75" index="1" offsetX="-1" offsetY="-27"/> + <end/> + </animation> + <animation direction="up"> + <frame delay="225" index="2" offsetX="-2" offsetY="-25"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-23"/> + <end/> + </animation> + <animation direction="right"> + <frame delay="75" index="3" offsetX="-3" offsetY="-30"/> + <frame delay="75" index="3" offsetX="-3" offsetY="-31"/> + <frame delay="75" index="3" offsetX="0" offsetY="-28"/> + <frame delay="75" index="3" offsetX="1" offsetY="-27"/> + <end/> + </animation> + </action> + <action imageset="base" name="attack_bow"> + <animation direction="down"> + <frame delay="225" index="0" offsetX="0" offsetY="-28"/> + <frame delay="75" index="0" offsetX="0" offsetY="-27"/> + <frame delay="75" index="0" offsetX="0" offsetY="-28"/> + <end/> + </animation> + <animation direction="left"> + <frame delay="225" index="1" offsetX="3" offsetY="-29"/> + <frame delay="150" index="1" offsetX="5" offsetY="-30"/> + <end/> + </animation> + <animation direction="up"> + <frame delay="225" index="2" offsetX="-1" offsetY="-25"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-24"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-25"/> + <end/> + </animation> + <animation direction="right"> + <frame delay="225" index="3" offsetX="-3" offsetY="-29"/> + <frame delay="150" index="3" offsetX="-5" offsetY="-30"/> + <end/> + </animation> + </action> + <action imageset="base" name="sit"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY="-17"/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="4" offsetY="-20"/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="0" offsetY="-17"/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-6" offsetY="-20"/> + </animation> + </action> + <action imageset="base" name="dead"> + <animation direction="default"> + <frame index="4" offsetX="21" offsetY="-4"/> + </animation> + </action> + <action name="attack_2hand" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="-1" offsetY="-26" delay="140"/> + <frame index="0" offsetX="-1" offsetY="-23" delay="140"/> + <frame index="0" offsetX="-1" offsetY="-28" delay="140"/> + <frame index="0" offsetX="-1" offsetY="-22" delay="140"/> + <end/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="-1" offsetY="-26" delay="140"/> + <frame index="1" offsetX="2" offsetY="-29" delay="140"/> + <frame index="1" offsetX="4" offsetY="-29" delay="140"/> + <frame index="1" offsetX="-3" offsetY="-25" delay="140"/> + <end/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-3" offsetY="-24" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-22" delay="140"/> + <frame index="2" offsetX="-2" offsetY="-25" delay="140"/> + <end/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="2" offsetY="-26" delay="140"/> + <frame index="3" offsetX="-1" offsetY="-29" delay="140"/> + <frame index="3" offsetX="-3" offsetY="-29" delay="140"/> + <frame index="3" offsetX="3" offsetY="-25" delay="140"/> + <end/> + </animation> + </action> + <action name="attack_sword_stab" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY="-27" delay="100"/> + <frame index="0" offsetX="0" offsetY="-28" delay="100"/> + <frame index="0" offsetX="0" offsetY="-25" delay="100"/> + <frame index="0" offsetX="0" offsetY="-24" delay="100"/> + <end/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="4" offsetY="-30" delay="100"/> + <frame index="1" offsetX="4" offsetY="-31" delay="100"/> + <frame index="1" offsetX="0" offsetY="-28" delay="100"/> + <frame index="1" offsetX="-1" offsetY="-27" delay="100"/> + <end/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-2" offsetY="-25" delay="300"/> + <frame index="2" offsetX="-2" offsetY="-23" delay="100"/> + <end/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-3" offsetY="-30" delay="100"/> + <frame index="3" offsetX="-3" offsetY="-31" delay="100"/> + <frame index="3" offsetX="0" offsetY="-28" delay="100"/> + <frame index="3" offsetX="1" offsetY="-27" delay="100"/> + <end/> + </animation> + </action> + <action name="attack_spear" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="-2" offsetY="-29" delay="280"/> + <frame index="0" offsetX="-2" offsetY="-30" delay="140"/> + <frame index="0" offsetX="-2" offsetY="-24" delay="140"/> + <end/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="4" offsetY="-30" delay="140"/> + <frame index="1" offsetX="7" offsetY="-28" delay="140"/> + <frame index="1" offsetX="0" offsetY="-30" delay="140"/> + <frame index="1" offsetX="0" offsetY="-27" delay="140"/> + <end/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-4" offsetY="-25" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-25" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-24" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-29" delay="140"/> + <end/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-3" offsetY="-30" delay="140"/> + <frame index="3" offsetX="-5" offsetY="-28" delay="140"/> + <frame index="3" offsetX="1" offsetY="-30" delay="140"/> + <frame index="3" offsetX="2" offsetY="-27" delay="140"/> + <end/> + </animation> + </action> + <action name="attack_chop" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="-1" offsetY="-26" delay="280"/> + <frame index="0" offsetX="-1" offsetY="-28" delay="140"/> + <frame index="0" offsetX="-1" offsetY="-22" delay="140"/> + <end/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="3" offsetY="-30" delay="140"/> + <frame index="1" offsetX="3" offsetY="-31" delay="280"/> + <frame index="1" offsetX="-2" offsetY="-27" delay="140"/> + <end/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-3" offsetY="-24" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-23" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-22" delay="140"/> + <end/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-3" offsetY="-30" delay="140"/> + <frame index="3" offsetX="-2" offsetY="-31" delay="280"/> + <frame index="3" offsetX="3" offsetY="-27" delay="140"/> + <end/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/equipment/head/beaniecopter-female.xml b/graphics/sprites/equipment/head/beaniecopter-female.xml index d2ffedfb..3c999c11 100644 --- a/graphics/sprites/equipment/head/beaniecopter-female.xml +++ b/graphics/sprites/equipment/head/beaniecopter-female.xml @@ -45,30 +45,30 @@ </action> <action name="walk" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" delay="56"/> - <frame index="1" offsetX="-1" delay="19"/> - <frame index="1" offsetX="-1" offsetY="-1" delay="37"/> - <frame index="2" offsetX="-1" offsetY="-1" delay="56"/> - <frame index="3" offsetX="-1" offsetY="-1" delay="57"/> - <frame index="0" offsetX="-1" delay="55"/> - <frame index="1" offsetX="-1" delay="20"/> - <frame index="1" offsetX="-1" offsetY="-1" delay="36"/> - <frame index="2" offsetX="-1" offsetY="-1" delay="56"/> - <frame index="3" offsetX="-1" offsetY="-1" delay="58"/> + <frame index="0" offsetX="-1" offsetY="1" delay="56"/> + <frame index="1" offsetX="-1" offsetY="1" delay="19"/> + <frame index="1" offsetX="-1" offsetY="0" delay="37"/> + <frame index="2" offsetX="-1" offsetY="0" delay="56"/> + <frame index="3" offsetX="-1" offsetY="0" delay="57"/> + <frame index="0" offsetX="-1" offsetY="1" delay="55"/> + <frame index="1" offsetX="-1" offsetY="1" delay="20"/> + <frame index="1" offsetX="-1" offsetY="0" delay="36"/> + <frame index="2" offsetX="-1" offsetY="0" delay="56"/> + <frame index="3" offsetX="-1" offsetY="0" delay="58"/> </animation> <animation direction="left"> - <frame index="4" offsetX="-1" offsetY="-1" delay="56"/> - <frame index="5" offsetX="-1" offsetY="-1" delay="19"/> - <frame index="5" offsetX="-1" delay="37"/> - <frame index="6" offsetX="-1" delay="38"/> - <frame index="6" offsetX="-1" offsetY="-1" delay="18"/> - <frame index="7" offsetX="-1" offsetY="-1" delay="57"/> - <frame index="4" offsetX="-1" offsetY="-1" delay="55"/> - <frame index="5" offsetX="-1" offsetY="-1" delay="20"/> - <frame index="5" offsetX="-1" delay="36"/> - <frame index="6" offsetX="-1" delay="39"/> - <frame index="6" offsetX="-1" offsetY="-1" delay="17"/> - <frame index="7" offsetX="-1" offsetY="-1" delay="58"/> + <frame index="4" offsetX="0" offsetY="-1" delay="56"/> + <frame index="5" offsetX="0" offsetY="-1" delay="19"/> + <frame index="5" offsetX="0" delay="37"/> + <frame index="6" offsetX="0" delay="38"/> + <frame index="6" offsetX="0" offsetY="-1" delay="18"/> + <frame index="7" offsetX="0" offsetY="-1" delay="57"/> + <frame index="4" offsetX="0" offsetY="-1" delay="55"/> + <frame index="5" offsetX="0" offsetY="-1" delay="20"/> + <frame index="5" offsetX="0" delay="36"/> + <frame index="6" offsetX="0" delay="39"/> + <frame index="6" offsetX="0" offsetY="-1" delay="17"/> + <frame index="7" offsetX="0" offsetY="-1" delay="58"/> </animation> <animation direction="up"> <frame index="8" offsetX="-2" offsetY="-1" delay="56"/> @@ -288,47 +288,47 @@ </action> <action name="attack_spear" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-3" offsetY="0" delay="75"/> - <frame index="1" offsetX="-3" offsetY="0" delay="75"/> - <frame index="2" offsetX="-3" offsetY="0" delay="75"/> - <frame index="3" offsetX="-3" offsetY="0" delay="75"/> - <frame index="0" offsetX="-3" offsetY="-1" delay="75"/> - <frame index="1" offsetX="-3" offsetY="-1" delay="75"/> - <frame index="2" offsetX="-3" offsetY="5" delay="75"/> - <frame index="3" offsetX="-3" offsetY="5" delay="75"/> + <frame index="0" offsetX="-3" offsetY="0" delay="70"/> + <frame index="1" offsetX="-3" offsetY="0" delay="70"/> + <frame index="2" offsetX="-3" offsetY="0" delay="70"/> + <frame index="3" offsetX="-3" offsetY="0" delay="70"/> + <frame index="0" offsetX="-3" offsetY="-1" delay="70"/> + <frame index="1" offsetX="-3" offsetY="-1" delay="70"/> + <frame index="2" offsetX="-3" offsetY="5" delay="70"/> + <frame index="3" offsetX="-3" offsetY="5" delay="70"/> <end/> </animation> <animation direction="left"> - <frame index="4" offsetX="4" offsetY="-2" delay="75"/> - <frame index="5" offsetX="4" offsetY="-2" delay="75"/> - <frame index="6" offsetX="7" offsetY="0" delay="75"/> - <frame index="7" offsetX="7" offsetY="0" delay="75"/> - <frame index="4" offsetX="1" offsetY="-2" delay="75"/> - <frame index="5" offsetX="1" offsetY="-2" delay="75"/> - <frame index="6" offsetX="0" offsetY="1" delay="75"/> - <frame index="7" offsetX="0" offsetY="1" delay="75"/> + <frame index="4" offsetX="4" offsetY="-2" delay="70"/> + <frame index="5" offsetX="4" offsetY="-2" delay="70"/> + <frame index="6" offsetX="7" offsetY="0" delay="70"/> + <frame index="7" offsetX="7" offsetY="0" delay="70"/> + <frame index="4" offsetX="1" offsetY="-2" delay="70"/> + <frame index="5" offsetX="1" offsetY="-2" delay="70"/> + <frame index="6" offsetX="0" offsetY="1" delay="70"/> + <frame index="7" offsetX="0" offsetY="1" delay="70"/> <end/> </animation> <animation direction="up"> - <frame index="8" offsetX="-5" offsetY="-1" delay="75"/> - <frame index="9" offsetX="-5" offsetY="-1" delay="75"/> - <frame index="10" offsetX="-4" offsetY="-1" delay="75"/> - <frame index="11" offsetX="-4" offsetY="-1" delay="75"/> - <frame index="8" offsetX="-4" offsetY="0" delay="75"/> - <frame index="9" offsetX="-4" offsetY="0" delay="75"/> - <frame index="10" offsetX="-5" offsetY="-5" delay="75"/> - <frame index="11" offsetX="-5" offsetY="-5" delay="75"/> + <frame index="8" offsetX="-5" offsetY="-1" delay="70"/> + <frame index="9" offsetX="-5" offsetY="-1" delay="70"/> + <frame index="10" offsetX="-4" offsetY="-1" delay="70"/> + <frame index="11" offsetX="-4" offsetY="-1" delay="70"/> + <frame index="8" offsetX="-4" offsetY="0" delay="70"/> + <frame index="9" offsetX="-4" offsetY="0" delay="70"/> + <frame index="10" offsetX="-5" offsetY="-5" delay="70"/> + <frame index="11" offsetX="-5" offsetY="-5" delay="70"/> <end/> </animation> <animation direction="right"> - <frame index="12" offsetX="-3" offsetY="-2" delay="75"/> - <frame index="13" offsetX="-3" offsetY="-2" delay="75"/> - <frame index="14" offsetX="-5" offsetY="0" delay="75"/> - <frame index="15" offsetX="-5" offsetY="0" delay="75"/> - <frame index="12" offsetX="1" offsetY="-2" delay="75"/> - <frame index="13" offsetX="1" offsetY="-2" delay="75"/> - <frame index="14" offsetX="4" offsetY="1" delay="75"/> - <frame index="15" offsetX="4" offsetY="1" delay="75"/> + <frame index="12" offsetX="-3" offsetY="-2" delay="70"/> + <frame index="13" offsetX="-3" offsetY="-2" delay="70"/> + <frame index="14" offsetX="-5" offsetY="0" delay="70"/> + <frame index="15" offsetX="-5" offsetY="0" delay="70"/> + <frame index="12" offsetX="1" offsetY="-2" delay="70"/> + <frame index="13" offsetX="1" offsetY="-2" delay="70"/> + <frame index="14" offsetX="4" offsetY="1" delay="70"/> + <frame index="15" offsetX="4" offsetY="1" delay="70"/> <end/> </animation> </action> diff --git a/graphics/sprites/equipment/head/beaniecopter.xml b/graphics/sprites/equipment/head/beaniecopter.xml index 62a4dc83..b0fbf8f6 100644 --- a/graphics/sprites/equipment/head/beaniecopter.xml +++ b/graphics/sprites/equipment/head/beaniecopter.xml @@ -45,30 +45,30 @@ </action> <action name="walk" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" delay="56"/> - <frame index="1" offsetX="-1" delay="19"/> - <frame index="1" offsetX="-1" offsetY="-1" delay="37"/> - <frame index="2" offsetX="-1" offsetY="-1" delay="56"/> - <frame index="3" offsetX="-1" offsetY="-1" delay="57"/> - <frame index="0" offsetX="-1" delay="55"/> - <frame index="1" offsetX="-1" delay="20"/> - <frame index="1" offsetX="-1" offsetY="-1" delay="36"/> - <frame index="2" offsetX="-1" offsetY="-1" delay="56"/> - <frame index="3" offsetX="-1" offsetY="-1" delay="58"/> + <frame index="0" offsetX="-1" offsetY="1" delay="56"/> + <frame index="1" offsetX="-1" offsetY="1" delay="19"/> + <frame index="1" offsetX="-1" offsetY="0" delay="37"/> + <frame index="2" offsetX="-1" offsetY="0" delay="56"/> + <frame index="3" offsetX="-1" offsetY="0" delay="57"/> + <frame index="0" offsetX="-1" offsetY="1" delay="55"/> + <frame index="1" offsetX="-1" offsetY="1" delay="20"/> + <frame index="1" offsetX="-1" offsetY="0" delay="36"/> + <frame index="2" offsetX="-1" offsetY="0" delay="56"/> + <frame index="3" offsetX="-1" offsetY="0" delay="58"/> </animation> <animation direction="left"> - <frame index="4" offsetX="-1" offsetY="-1" delay="56"/> - <frame index="5" offsetX="-1" offsetY="-1" delay="19"/> - <frame index="5" offsetX="-1" delay="37"/> - <frame index="6" offsetX="-1" delay="38"/> - <frame index="6" offsetX="-1" offsetY="-1" delay="18"/> - <frame index="7" offsetX="-1" offsetY="-1" delay="57"/> - <frame index="4" offsetX="-1" offsetY="-1" delay="55"/> - <frame index="5" offsetX="-1" offsetY="-1" delay="20"/> - <frame index="5" offsetX="-1" delay="36"/> - <frame index="6" offsetX="-1" delay="39"/> - <frame index="6" offsetX="-1" offsetY="-1" delay="17"/> - <frame index="7" offsetX="-1" offsetY="-1" delay="58"/> + <frame index="4" offsetX="0" offsetY="-1" delay="56"/> + <frame index="5" offsetX="0" offsetY="-1" delay="19"/> + <frame index="5" offsetX="0" delay="37"/> + <frame index="6" offsetX="0" delay="38"/> + <frame index="6" offsetX="0" offsetY="-1" delay="18"/> + <frame index="7" offsetX="0" offsetY="-1" delay="57"/> + <frame index="4" offsetX="0" offsetY="-1" delay="55"/> + <frame index="5" offsetX="0" offsetY="-1" delay="20"/> + <frame index="5" offsetX="0" delay="36"/> + <frame index="6" offsetX="0" delay="39"/> + <frame index="6" offsetX="0" offsetY="-1" delay="17"/> + <frame index="7" offsetX="0" offsetY="-1" delay="58"/> </animation> <animation direction="up"> <frame index="8" offsetX="-2" offsetY="-1" delay="56"/> @@ -288,47 +288,47 @@ </action> <action name="attack_spear" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-2" offsetY="-1" delay="75"/> - <frame index="1" offsetX="-2" offsetY="-1" delay="75"/> - <frame index="2" offsetX="-2" offsetY="-1" delay="75"/> - <frame index="3" offsetX="-2" offsetY="-1" delay="75"/> - <frame index="0" offsetX="-2" offsetY="-2" delay="75"/> - <frame index="1" offsetX="-2" offsetY="-2" delay="75"/> - <frame index="2" offsetX="-2" offsetY="5" delay="75"/> - <frame index="3" offsetX="-2" offsetY="5" delay="75"/> + <frame index="0" offsetX="-2" offsetY="-1" delay="70"/> + <frame index="1" offsetX="-2" offsetY="-1" delay="70"/> + <frame index="2" offsetX="-2" offsetY="-1" delay="70"/> + <frame index="3" offsetX="-2" offsetY="-1" delay="70"/> + <frame index="0" offsetX="-2" offsetY="-2" delay="70"/> + <frame index="1" offsetX="-2" offsetY="-2" delay="70"/> + <frame index="2" offsetX="-2" offsetY="5" delay="70"/> + <frame index="3" offsetX="-2" offsetY="5" delay="70"/> <end/> </animation> <animation direction="left"> - <frame index="4" offsetX="5" offsetY="-2" delay="75"/> - <frame index="5" offsetX="5" offsetY="-2" delay="75"/> - <frame index="6" offsetX="6" offsetY="-3" delay="75"/> - <frame index="7" offsetX="6" offsetY="-3" delay="75"/> - <frame index="4" offsetX="2" offsetY="-4" delay="75"/> - <frame index="5" offsetX="2" offsetY="-4" delay="75"/> - <frame index="6" offsetX="-1" offsetY="1" delay="75"/> - <frame index="7" offsetX="-1" offsetY="1" delay="75"/> + <frame index="4" offsetX="5" offsetY="-2" delay="70"/> + <frame index="5" offsetX="5" offsetY="-2" delay="70"/> + <frame index="6" offsetX="6" offsetY="-3" delay="70"/> + <frame index="7" offsetX="6" offsetY="-3" delay="70"/> + <frame index="4" offsetX="2" offsetY="-4" delay="70"/> + <frame index="5" offsetX="2" offsetY="-4" delay="70"/> + <frame index="6" offsetX="-1" offsetY="1" delay="70"/> + <frame index="7" offsetX="-1" offsetY="1" delay="70"/> <end/> </animation> <animation direction="up"> - <frame index="8" offsetX="-3" offsetY="-1" delay="75"/> - <frame index="9" offsetX="-3" offsetY="-1" delay="75"/> - <frame index="10" offsetX="-3" offsetY="-1" delay="75"/> - <frame index="11" offsetX="-3" offsetY="-1" delay="75"/> - <frame index="8" offsetX="-3" offsetY="-1" delay="75"/> - <frame index="9" offsetX="-3" offsetY="-1" delay="75"/> - <frame index="10" offsetX="-4" offsetY="-4" delay="75"/> - <frame index="11" offsetX="-4" offsetY="-4" delay="75"/> + <frame index="8" offsetX="-3" offsetY="-1" delay="70"/> + <frame index="9" offsetX="-3" offsetY="-1" delay="70"/> + <frame index="10" offsetX="-3" offsetY="-1" delay="70"/> + <frame index="11" offsetX="-3" offsetY="-1" delay="70"/> + <frame index="8" offsetX="-3" offsetY="-1" delay="70"/> + <frame index="9" offsetX="-3" offsetY="-1" delay="70"/> + <frame index="10" offsetX="-4" offsetY="-4" delay="70"/> + <frame index="11" offsetX="-4" offsetY="-4" delay="70"/> <end/> </animation> <animation direction="right"> - <frame index="12" offsetX="-3" offsetY="-2" delay="75"/> - <frame index="13" offsetX="-3" offsetY="-2" delay="75"/> - <frame index="14" offsetX="-4" offsetY="-3" delay="75"/> - <frame index="15" offsetX="-4" offsetY="-3" delay="75"/> - <frame index="12" offsetX="1" offsetY="-4" delay="75"/> - <frame index="13" offsetX="1" offsetY="-4" delay="75"/> - <frame index="14" offsetX="3" offsetY="1" delay="75"/> - <frame index="15" offsetX="3" offsetY="1" delay="75"/> + <frame index="12" offsetX="-3" offsetY="-2" delay="70"/> + <frame index="13" offsetX="-3" offsetY="-2" delay="70"/> + <frame index="14" offsetX="-4" offsetY="-3" delay="70"/> + <frame index="15" offsetX="-4" offsetY="-3" delay="70"/> + <frame index="12" offsetX="1" offsetY="-4" delay="70"/> + <frame index="13" offsetX="1" offsetY="-4" delay="70"/> + <frame index="14" offsetX="3" offsetY="1" delay="70"/> + <frame index="15" offsetX="3" offsetY="1" delay="70"/> <end/> </animation> </action> diff --git a/graphics/sprites/equipment/head/captain-hat-female.xml b/graphics/sprites/equipment/head/captain-hat-female.xml index dbb5add4..dbfd0a71 100644 --- a/graphics/sprites/equipment/head/captain-hat-female.xml +++ b/graphics/sprites/equipment/head/captain-hat-female.xml @@ -9,7 +9,7 @@ <frame index="1" offsetX="0" offsetY="-43"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-3" offsetY="-43"/> + <frame index="2" offsetX="-2" offsetY="-43"/> </animation> <animation direction="right"> <frame index="3" offsetX="-1" offsetY="-43"/> @@ -30,10 +30,10 @@ <frame delay="75" index="1" offsetX="0" offsetY="-43"/> </animation> <animation direction="up"> - <frame delay="75" index="2" offsetX="-3" offsetY="-43"/> - <frame delay="150" index="2" offsetX="-3" offsetY="-44"/> - <frame delay="75" index="2" offsetX="-3" offsetY="-43"/> - <frame delay="150" index="2" offsetX="-3" offsetY="-44"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-43"/> + <frame delay="150" index="2" offsetX="-2" offsetY="-44"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-43"/> + <frame delay="150" index="2" offsetX="-2" offsetY="-44"/> </animation> <animation direction="right"> <frame delay="75" index="3" offsetX="-1" offsetY="-43"/> @@ -59,8 +59,8 @@ <end/> </animation> <animation direction="up"> - <frame delay="225" index="2" offsetX="-4" offsetY="-43"/> - <frame delay="75" index="2" offsetX="-4" offsetY="-41"/> + <frame delay="225" index="2" offsetX="-3" offsetY="-43"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-41"/> <end/> </animation> <animation direction="right"> @@ -84,9 +84,9 @@ <end/> </animation> <animation direction="up"> - <frame delay="225" index="2" offsetX="-3" offsetY="-43"/> - <frame delay="75" index="2" offsetX="-4" offsetY="-42"/> - <frame delay="75" index="2" offsetX="-4" offsetY="-43"/> + <frame delay="225" index="2" offsetX="-2" offsetY="-43"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-42"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-43"/> <end/> </animation> <animation direction="right"> @@ -103,7 +103,7 @@ <frame index="1" offsetX="4" offsetY="-34"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-35"/> + <frame index="2" offsetX="-1" offsetY="-35"/> </animation> <animation direction="right"> <frame index="3" offsetX="-7" offsetY="-34"/> @@ -130,9 +130,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-5" offsetY="-42" delay="280"/> - <frame index="2" offsetX="-5" offsetY="-40" delay="140"/> - <frame index="2" offsetX="-4" offsetY="-43" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-42" delay="280"/> + <frame index="2" offsetX="-4" offsetY="-40" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-43" delay="140"/> <end/> </animation> <animation direction="right"> @@ -159,8 +159,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-4" offsetY="-43" delay="300"/> - <frame index="2" offsetX="-4" offsetY="-41" delay="100"/> + <frame index="2" offsetX="-3" offsetY="-43" delay="300"/> + <frame index="2" offsetX="-3" offsetY="-41" delay="100"/> <end/> </animation> <animation direction="right"> @@ -186,10 +186,10 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-6" offsetY="-43" delay="140"/> <frame index="2" offsetX="-5" offsetY="-43" delay="140"/> - <frame index="2" offsetX="-5" offsetY="-42" delay="140"/> - <frame index="2" offsetX="-6" offsetY="-47" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-43" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-42" delay="140"/> + <frame index="2" offsetX="-5" offsetY="-47" delay="140"/> <end/> </animation> <animation direction="right"> @@ -214,9 +214,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-5" offsetY="-42" delay="140"/> - <frame index="2" offsetX="-5" offsetY="-41" delay="280"/> - <frame index="2" offsetX="-5" offsetY="-40" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-42" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-41" delay="280"/> + <frame index="2" offsetX="-4" offsetY="-40" delay="140"/> <end/> </animation> <animation direction="right"> diff --git a/graphics/sprites/equipment/head/captain-hat.png b/graphics/sprites/equipment/head/captain-hat.png Binary files differindex e8947606..6428de46 100644 --- a/graphics/sprites/equipment/head/captain-hat.png +++ b/graphics/sprites/equipment/head/captain-hat.png diff --git a/graphics/sprites/equipment/head/captain-hat.xml b/graphics/sprites/equipment/head/captain-hat.xml index f1f319c2..74555c07 100644 --- a/graphics/sprites/equipment/head/captain-hat.xml +++ b/graphics/sprites/equipment/head/captain-hat.xml @@ -9,7 +9,7 @@ <frame index="1" offsetX="0" offsetY="-43"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-3" offsetY="-43"/> + <frame index="2" offsetX="-2" offsetY="-43"/> </animation> <animation direction="right"> <frame index="3" offsetX="-1" offsetY="-43"/> @@ -30,10 +30,10 @@ <frame index="1" offsetX="0" offsetY="-43" delay="75"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-3" offsetY="-43" delay="75"/> - <frame index="2" offsetX="-3" offsetY="-44" delay="150"/> - <frame index="2" offsetX="-3" offsetY="-43" delay="75"/> - <frame index="2" offsetX="-3" offsetY="-44" delay="150"/> + <frame index="2" offsetX="-2" offsetY="-43" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-44" delay="150"/> + <frame index="2" offsetX="-2" offsetY="-43" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-44" delay="150"/> </animation> <animation direction="right"> <frame index="3" offsetX="-1" offsetY="-43" delay="75"/> @@ -59,8 +59,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-4" offsetY="-43" delay="225"/> - <frame index="2" offsetX="-4" offsetY="-41" delay="75"/> + <frame index="2" offsetX="-3" offsetY="-43" delay="225"/> + <frame index="2" offsetX="-3" offsetY="-41" delay="75"/> <end/> </animation> <animation direction="right"> @@ -84,9 +84,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-3" offsetY="-43" delay="225"/> - <frame index="2" offsetX="-4" offsetY="-42" delay="75"/> - <frame index="2" offsetX="-4" offsetY="-43" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-43" delay="225"/> + <frame index="2" offsetX="-3" offsetY="-42" delay="75"/> + <frame index="2" offsetX="-3" offsetY="-43" delay="75"/> <end/> </animation> <animation direction="right"> @@ -103,7 +103,7 @@ <frame index="1" offsetX="4" offsetY="-34"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-35"/> + <frame index="2" offsetX="-1" offsetY="-35"/> </animation> <animation direction="right"> <frame index="3" offsetX="-7" offsetY="-34"/> @@ -130,9 +130,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-4" offsetY="-43" delay="280"/> - <frame index="2" offsetX="-4" offsetY="-41" delay="140"/> - <frame index="2" offsetX="-3" offsetY="-44" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-43" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-41" delay="140"/> + <frame index="2" offsetX="-2" offsetY="-44" delay="140"/> <end/> </animation> <animation direction="right"> @@ -159,8 +159,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-4" offsetY="-43" delay="300"/> - <frame index="2" offsetX="-4" offsetY="-41" delay="100"/> + <frame index="2" offsetX="-3" offsetY="-43" delay="300"/> + <frame index="2" offsetX="-3" offsetY="-41" delay="100"/> <end/> </animation> <animation direction="right"> @@ -186,8 +186,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-4" offsetY="-43" delay="420"/> - <frame index="2" offsetX="-5" offsetY="-46" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-43" delay="420"/> + <frame index="2" offsetX="-4" offsetY="-46" delay="140"/> <end/> </animation> <animation direction="right"> @@ -214,8 +214,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-4" offsetY="-43" delay="280"/> - <frame index="2" offsetX="-4" offsetY="-41" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-43" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-41" delay="280"/> <end/> </animation> <animation direction="right"> diff --git a/graphics/sprites/equipment/head/overlordhelm-female.xml b/graphics/sprites/equipment/head/overlordhelm-female.xml index 015977b8..1def230a 100644 --- a/graphics/sprites/equipment/head/overlordhelm-female.xml +++ b/graphics/sprites/equipment/head/overlordhelm-female.xml @@ -45,7 +45,7 @@ </action> <action imageset="base" name="attack"> <animation direction="down"> - <frame delay="75" index="0" offsetX="-1" offsetY="-39"/> + <frame delay="75" index="0" offsetX="-1" offsetY="-29"/> <frame delay="75" index="0" offsetX="-1" offsetY="-30"/> <frame delay="75" index="0" offsetX="-1" offsetY="-27"/> <frame delay="75" index="0" offsetX="-1" offsetY="-26"/> @@ -116,7 +116,7 @@ </action> <action name="attack_2hand" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-2" offsetY="-38" delay="140"/> + <frame index="0" offsetX="-2" offsetY="-28" delay="140"/> <frame index="0" offsetX="-2" offsetY="-25" delay="140"/> <frame index="0" offsetX="-2" offsetY="-30" delay="140"/> <frame index="0" offsetX="-2" offsetY="-24" delay="140"/> @@ -145,7 +145,7 @@ </action> <action name="attack_sword_stab" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-39" delay="100"/> + <frame index="0" offsetX="-1" offsetY="-29" delay="100"/> <frame index="0" offsetX="-1" offsetY="-30" delay="100"/> <frame index="0" offsetX="-1" offsetY="-27" delay="100"/> <frame index="0" offsetX="-1" offsetY="-26" delay="100"/> @@ -173,8 +173,7 @@ </action> <action name="attack_spear" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-3" offsetY="-41" delay="140"/> - <frame index="0" offsetX="-3" offsetY="-31" delay="140"/> + <frame index="0" offsetX="-3" offsetY="-31" delay="280"/> <frame index="0" offsetX="-3" offsetY="-32" delay="140"/> <frame index="0" offsetX="-3" offsetY="-26" delay="140"/> <end/> @@ -203,8 +202,7 @@ </action> <action name="attack_chop" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-2" offsetY="-38" delay="140"/> - <frame index="0" offsetX="-2" offsetY="-28" delay="140"/> + <frame index="0" offsetX="-2" offsetY="-28" delay="280"/> <frame index="0" offsetX="-2" offsetY="-30" delay="140"/> <frame index="0" offsetX="-2" offsetY="-24" delay="140"/> <end/> diff --git a/graphics/sprites/equipment/head/overlordhelm.xml b/graphics/sprites/equipment/head/overlordhelm.xml index 9dba725b..31660e5a 100644 --- a/graphics/sprites/equipment/head/overlordhelm.xml +++ b/graphics/sprites/equipment/head/overlordhelm.xml @@ -45,7 +45,7 @@ </action> <action name="attack" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-39" delay="75"/> + <frame index="0" offsetX="-1" offsetY="-29" delay="75"/> <frame index="0" offsetX="-1" offsetY="-30" delay="75"/> <frame index="0" offsetX="-1" offsetY="-27" delay="75"/> <frame index="0" offsetX="-1" offsetY="-26" delay="75"/> @@ -116,7 +116,7 @@ </action> <action name="attack_2hand" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-40" delay="140"/> + <frame index="0" offsetX="-1" offsetY="-30" delay="140"/> <frame index="0" offsetX="-1" offsetY="-26" delay="140"/> <frame index="0" offsetX="-1" offsetY="-31" delay="140"/> <frame index="0" offsetX="-1" offsetY="-26" delay="140"/> @@ -145,7 +145,7 @@ </action> <action name="attack_sword_stab" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-39" delay="100"/> + <frame index="0" offsetX="-1" offsetY="-29" delay="100"/> <frame index="0" offsetX="-1" offsetY="-30" delay="100"/> <frame index="0" offsetX="-1" offsetY="-27" delay="100"/> <frame index="0" offsetX="-1" offsetY="-26" delay="100"/> @@ -173,8 +173,7 @@ </action> <action name="attack_spear" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-2" offsetY="-42" delay="140"/> - <frame index="0" offsetX="-2" offsetY="-32" delay="140"/> + <frame index="0" offsetX="-2" offsetY="-32" delay="280"/> <frame index="0" offsetX="-2" offsetY="-33" delay="140"/> <frame index="0" offsetX="-2" offsetY="-26" delay="140"/> <end/> @@ -201,7 +200,7 @@ </action> <action name="attack_chop" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-39" delay="140"/> + <frame index="0" offsetX="-1" offsetY="-29" delay="140"/> <frame index="0" offsetX="-2" offsetY="-30" delay="140"/> <frame index="0" offsetX="-1" offsetY="-32" delay="140"/> <frame index="0" offsetX="-1" offsetY="-27" delay="140"/> diff --git a/graphics/sprites/equipment/head/paladinhelm-female.xml b/graphics/sprites/equipment/head/paladinhelm-female.xml index 4531329d..09b21a89 100644 --- a/graphics/sprites/equipment/head/paladinhelm-female.xml +++ b/graphics/sprites/equipment/head/paladinhelm-female.xml @@ -45,7 +45,7 @@ </action> <action imageset="base" name="attack"> <animation direction="down"> - <frame delay="75" index="0" offsetX="-1" offsetY="-39"/> + <frame delay="75" index="0" offsetX="-1" offsetY="-29"/> <frame delay="75" index="0" offsetX="-1" offsetY="-30"/> <frame delay="75" index="0" offsetX="-1" offsetY="-27"/> <frame delay="75" index="0" offsetX="-1" offsetY="-26"/> @@ -116,7 +116,7 @@ </action> <action name="attack_2hand" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-2" offsetY="-38" delay="140"/> + <frame index="0" offsetX="-2" offsetY="-28" delay="140"/> <frame index="0" offsetX="-2" offsetY="-25" delay="140"/> <frame index="0" offsetX="-2" offsetY="-30" delay="140"/> <frame index="0" offsetX="-2" offsetY="-24" delay="140"/> @@ -145,7 +145,7 @@ </action> <action name="attack_sword_stab" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-39" delay="100"/> + <frame index="0" offsetX="-1" offsetY="-29" delay="100"/> <frame index="0" offsetX="-1" offsetY="-30" delay="100"/> <frame index="0" offsetX="-1" offsetY="-27" delay="100"/> <frame index="0" offsetX="-1" offsetY="-26" delay="100"/> @@ -173,8 +173,7 @@ </action> <action name="attack_spear" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-3" offsetY="-41" delay="140"/> - <frame index="0" offsetX="-3" offsetY="-31" delay="140"/> + <frame index="0" offsetX="-3" offsetY="-31" delay="280"/> <frame index="0" offsetX="-3" offsetY="-32" delay="140"/> <frame index="0" offsetX="-3" offsetY="-26" delay="140"/> <end/> @@ -203,8 +202,7 @@ </action> <action name="attack_chop" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-2" offsetY="-38" delay="140"/> - <frame index="0" offsetX="-2" offsetY="-28" delay="140"/> + <frame index="0" offsetX="-2" offsetY="-28" delay="280"/> <frame index="0" offsetX="-2" offsetY="-30" delay="140"/> <frame index="0" offsetX="-2" offsetY="-24" delay="140"/> <end/> diff --git a/graphics/sprites/equipment/head/paladinhelm.xml b/graphics/sprites/equipment/head/paladinhelm.xml index 347bd0ab..5e4f5c2d 100644 --- a/graphics/sprites/equipment/head/paladinhelm.xml +++ b/graphics/sprites/equipment/head/paladinhelm.xml @@ -45,7 +45,7 @@ </action> <action name="attack" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-39" delay="75"/> + <frame index="0" offsetX="-1" offsetY="-29" delay="75"/> <frame index="0" offsetX="-1" offsetY="-30" delay="75"/> <frame index="0" offsetX="-1" offsetY="-27" delay="75"/> <frame index="0" offsetX="-1" offsetY="-26" delay="75"/> @@ -116,7 +116,7 @@ </action> <action name="attack_2hand" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-40" delay="140"/> + <frame index="0" offsetX="-1" offsetY="-30" delay="140"/> <frame index="0" offsetX="-1" offsetY="-26" delay="140"/> <frame index="0" offsetX="-1" offsetY="-31" delay="140"/> <frame index="0" offsetX="-1" offsetY="-26" delay="140"/> @@ -145,7 +145,7 @@ </action> <action name="attack_sword_stab" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-39" delay="100"/> + <frame index="0" offsetX="-1" offsetY="-29" delay="100"/> <frame index="0" offsetX="-1" offsetY="-30" delay="100"/> <frame index="0" offsetX="-1" offsetY="-27" delay="100"/> <frame index="0" offsetX="-1" offsetY="-26" delay="100"/> @@ -173,8 +173,7 @@ </action> <action name="attack_spear" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-2" offsetY="-42" delay="140"/> - <frame index="0" offsetX="-2" offsetY="-32" delay="140"/> + <frame index="0" offsetX="-2" offsetY="-32" delay="280"/> <frame index="0" offsetX="-2" offsetY="-33" delay="140"/> <frame index="0" offsetX="-2" offsetY="-26" delay="140"/> <end/> @@ -201,7 +200,7 @@ </action> <action name="attack_chop" imageset="base"> <animation direction="down"> - <frame index="0" offsetX="-1" offsetY="-39" delay="140"/> + <frame index="0" offsetX="-1" offsetY="-29" delay="140"/> <frame index="0" offsetX="-2" offsetY="-30" delay="140"/> <frame index="0" offsetX="-1" offsetY="-32" delay="140"/> <frame index="0" offsetX="-1" offsetY="-27" delay="140"/> diff --git a/graphics/sprites/equipment/head/phylactery-female.xml b/graphics/sprites/equipment/head/phylactery-female.xml index bd263a0d..516fccbe 100644 --- a/graphics/sprites/equipment/head/phylactery-female.xml +++ b/graphics/sprites/equipment/head/phylactery-female.xml @@ -6,13 +6,13 @@ <frame delay="75" index="0" offsetX="0" offsetY="-29"/> </animation> <animation direction="left"> - <frame delay="75" index="1" offsetX="0" offsetY="-28"/> + <frame delay="75" index="1" offsetX="0" offsetY="-29"/> </animation> <animation direction="up"> <frame delay="75" index="2" offsetX="-1" offsetY="-25"/> </animation> <animation direction="right"> - <frame delay="75" index="3" offsetX="0" offsetY="-28"/> + <frame delay="75" index="3" offsetX="0" offsetY="-29"/> </animation> </action> <action imageset="base" name="walk"> @@ -48,13 +48,13 @@ <frame index="0" offsetX="0" offsetY="-17"/> </animation> <animation direction="left"> - <frame index="1" offsetX="6" offsetY="-18"/> + <frame index="1" offsetX="4" offsetY="-20"/> </animation> <animation direction="up"> <frame index="2" offsetX="0" offsetY="-17"/> </animation> <animation direction="right"> - <frame index="3" offsetX="-5" offsetY="-17"/> + <frame index="3" offsetX="-5" offsetY="-20"/> </animation> </action> <action imageset="base" name="attack"> @@ -85,6 +85,30 @@ <end/> </animation> </action> + <action imageset="base" name="attack_bow"> + <animation direction="down"> + <frame delay="225" index="0" offsetX="0" offsetY="-28"/> + <frame delay="75" index="0" offsetX="0" offsetY="-27"/> + <frame delay="75" index="0" offsetX="0" offsetY="-28"/> + <end/> + </animation> + <animation direction="left"> + <frame delay="225" index="1" offsetX="3" offsetY="-29"/> + <frame delay="150" index="1" offsetX="5" offsetY="-30"/> + <end/> + </animation> + <animation direction="up"> + <frame delay="225" index="2" offsetX="-1" offsetY="-25"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-24"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-25"/> + <end/> + </animation> + <animation direction="right"> + <frame delay="225" index="3" offsetX="-3" offsetY="-29"/> + <frame delay="150" index="3" offsetX="-5" offsetY="-30"/> + <end/> + </animation> + </action> <action imageset="base" name="dead"> <animation direction="default"> <frame index="4" offsetX="22" offsetY="-4"/> diff --git a/graphics/sprites/equipment/head/phylactery.xml b/graphics/sprites/equipment/head/phylactery.xml index 82a63c64..4b051c41 100644 --- a/graphics/sprites/equipment/head/phylactery.xml +++ b/graphics/sprites/equipment/head/phylactery.xml @@ -6,13 +6,13 @@ <frame index="0" offsetX="0" offsetY="-29" delay="75"/> </animation> <animation direction="left"> - <frame index="1" offsetX="0" offsetY="-28" delay="75"/> + <frame index="1" offsetX="0" offsetY="-29" delay="75"/> </animation> <animation direction="up"> <frame index="2" offsetX="-1" offsetY="-25" delay="75"/> </animation> <animation direction="right"> - <frame index="3" offsetX="0" offsetY="-28" delay="75"/> + <frame index="3" offsetX="0" offsetY="-29" delay="75"/> </animation> </action> <action name="walk" imageset="base"> @@ -48,13 +48,13 @@ <frame index="0" offsetX="0" offsetY="-17"/> </animation> <animation direction="left"> - <frame index="1" offsetX="6" offsetY="-18"/> + <frame index="1" offsetX="4" offsetY="-20"/> </animation> <animation direction="up"> <frame index="2" offsetX="0" offsetY="-17"/> </animation> <animation direction="right"> - <frame index="3" offsetX="-5" offsetY="-17"/> + <frame index="3" offsetX="-5" offsetY="-20"/> </animation> </action> <action name="attack" imageset="base"> @@ -85,6 +85,30 @@ <end/> </animation> </action> + <action name="attack_bow" imageset="base"> + <animation direction="down"> + <frame index="0" offsetX="0" offsetY="-28" delay="225"/> + <frame index="0" offsetX="0" offsetY="-27" delay="75"/> + <frame index="0" offsetX="0" offsetY="-28" delay="75"/> + <end/> + </animation> + <animation direction="left"> + <frame index="1" offsetX="3" offsetY="-29" delay="225"/> + <frame index="1" offsetX="5" offsetY="-30" delay="150"/> + <end/> + </animation> + <animation direction="up"> + <frame index="2" offsetX="-1" offsetY="-25" delay="225"/> + <frame index="2" offsetX="-2" offsetY="-24" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-25" delay="75"/> + <end/> + </animation> + <animation direction="right"> + <frame index="3" offsetX="-3" offsetY="-29" delay="225"/> + <frame index="3" offsetX="-5" offsetY="-30" delay="150"/> + <end/> + </animation> + </action> <action name="dead" imageset="base"> <animation direction="default"> <frame index="4" offsetX="22" offsetY="-4"/> diff --git a/graphics/sprites/equipment/head/underworld-mask-female.xml b/graphics/sprites/equipment/head/underworld-mask-female.xml index 427637ce..29a18feb 100644 --- a/graphics/sprites/equipment/head/underworld-mask-female.xml +++ b/graphics/sprites/equipment/head/underworld-mask-female.xml @@ -9,7 +9,7 @@ <frame index="1" offsetX="0" offsetY="-29"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-1" offsetY="-29"/> + <frame index="2" offsetX="-2" offsetY="-26"/> </animation> <animation direction="right"> <frame index="3" offsetX="0" offsetY="-29"/> @@ -30,10 +30,10 @@ <frame delay="75" index="1" offsetX="0" offsetY="-29"/> </animation> <animation direction="up"> - <frame delay="75" index="2" offsetX="-1" offsetY="-29"/> - <frame delay="150" index="2" offsetX="-1" offsetY="-30"/> - <frame delay="75" index="2" offsetX="-1" offsetY="-29"/> - <frame delay="150" index="2" offsetX="-1" offsetY="-30"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-26"/> + <frame delay="150" index="2" offsetX="-2" offsetY="-27"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-26"/> + <frame delay="150" index="2" offsetX="-2" offsetY="-27"/> </animation> <animation direction="right"> <frame delay="75" index="3" offsetX="0" offsetY="-29"/> @@ -59,8 +59,8 @@ <end/> </animation> <animation direction="up"> - <frame delay="225" index="2" offsetX="-2" offsetY="-29"/> - <frame delay="75" index="2" offsetX="-2" offsetY="-27"/> + <frame delay="225" index="2" offsetX="-3" offsetY="-26"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-24"/> <end/> </animation> <animation direction="right"> @@ -84,9 +84,9 @@ <end/> </animation> <animation direction="up"> - <frame delay="225" index="2" offsetX="-1" offsetY="-29"/> - <frame delay="75" index="2" offsetX="-2" offsetY="-28"/> - <frame delay="75" index="2" offsetX="-2" offsetY="-29"/> + <frame delay="225" index="2" offsetX="-2" offsetY="-26"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-25"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-26"/> <end/> </animation> <animation direction="right"> @@ -103,7 +103,7 @@ <frame index="1" offsetX="4" offsetY="-20"/> </animation> <animation direction="up"> - <frame index="2" offsetX="0" offsetY="-21"/> + <frame index="2" offsetX="-1" offsetY="-18"/> </animation> <animation direction="right"> <frame index="3" offsetX="-6" offsetY="-20"/> @@ -130,9 +130,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-3" offsetY="-28" delay="280"/> + <frame index="2" offsetX="-4" offsetY="-25" delay="280"/> + <frame index="2" offsetX="-4" offsetY="-23" delay="140"/> <frame index="2" offsetX="-3" offsetY="-26" delay="140"/> - <frame index="2" offsetX="-2" offsetY="-29" delay="140"/> <end/> </animation> <animation direction="right"> @@ -159,8 +159,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-29" delay="300"/> - <frame index="2" offsetX="-2" offsetY="-27" delay="100"/> + <frame index="2" offsetX="-3" offsetY="-26" delay="300"/> + <frame index="2" offsetX="-3" offsetY="-24" delay="100"/> <end/> </animation> <animation direction="right"> @@ -186,10 +186,10 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-4" offsetY="-29" delay="140"/> - <frame index="2" offsetX="-3" offsetY="-29" delay="140"/> - <frame index="2" offsetX="-3" offsetY="-28" delay="140"/> - <frame index="2" offsetX="-4" offsetY="-33" delay="140"/> + <frame index="2" offsetX="-5" offsetY="-26" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-26" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-25" delay="140"/> + <frame index="2" offsetX="-5" offsetY="-30" delay="140"/> <end/> </animation> <animation direction="right"> @@ -214,9 +214,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-3" offsetY="-28" delay="140"/> - <frame index="2" offsetX="-3" offsetY="-27" delay="280"/> - <frame index="2" offsetX="-3" offsetY="-26" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-25" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-24" delay="280"/> + <frame index="2" offsetX="-4" offsetY="-23" delay="140"/> <end/> </animation> <animation direction="right"> diff --git a/graphics/sprites/equipment/head/underworld-mask.xml b/graphics/sprites/equipment/head/underworld-mask.xml index a716e7eb..741c998a 100644 --- a/graphics/sprites/equipment/head/underworld-mask.xml +++ b/graphics/sprites/equipment/head/underworld-mask.xml @@ -9,7 +9,7 @@ <frame index="1" offsetX="0" offsetY="-29"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-1" offsetY="-29"/> + <frame index="2" offsetX="-2" offsetY="-26"/> </animation> <animation direction="right"> <frame index="3" offsetX="0" offsetY="-29"/> @@ -30,10 +30,10 @@ <frame index="1" offsetX="0" offsetY="-29" delay="75"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-1" offsetY="-29" delay="75"/> - <frame index="2" offsetX="-1" offsetY="-30" delay="150"/> - <frame index="2" offsetX="-1" offsetY="-29" delay="75"/> - <frame index="2" offsetX="-1" offsetY="-30" delay="150"/> + <frame index="2" offsetX="-2" offsetY="-26" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-27" delay="150"/> + <frame index="2" offsetX="-2" offsetY="-26" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-27" delay="150"/> </animation> <animation direction="right"> <frame index="3" offsetX="0" offsetY="-29" delay="75"/> @@ -59,8 +59,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-29" delay="225"/> - <frame index="2" offsetX="-2" offsetY="-27" delay="75"/> + <frame index="2" offsetX="-3" offsetY="-26" delay="225"/> + <frame index="2" offsetX="-3" offsetY="-24" delay="75"/> <end/> </animation> <animation direction="right"> @@ -84,9 +84,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-1" offsetY="-29" delay="225"/> - <frame index="2" offsetX="-2" offsetY="-28" delay="75"/> - <frame index="2" offsetX="-2" offsetY="-29" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-26" delay="225"/> + <frame index="2" offsetX="-3" offsetY="-25" delay="75"/> + <frame index="2" offsetX="-3" offsetY="-26" delay="75"/> <end/> </animation> <animation direction="right"> @@ -103,7 +103,7 @@ <frame index="1" offsetX="4" offsetY="-20"/> </animation> <animation direction="up"> - <frame index="2" offsetX="0" offsetY="-21"/> + <frame index="2" offsetX="-1" offsetY="-18"/> </animation> <animation direction="right"> <frame index="3" offsetX="-6" offsetY="-20"/> @@ -130,9 +130,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-29" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-26" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-24" delay="140"/> <frame index="2" offsetX="-2" offsetY="-27" delay="140"/> - <frame index="2" offsetX="-1" offsetY="-30" delay="140"/> <end/> </animation> <animation direction="right"> @@ -159,8 +159,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-29" delay="300"/> - <frame index="2" offsetX="-2" offsetY="-27" delay="100"/> + <frame index="2" offsetX="-3" offsetY="-26" delay="300"/> + <frame index="2" offsetX="-3" offsetY="-24" delay="100"/> <end/> </animation> <animation direction="right"> @@ -186,8 +186,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-29" delay="420"/> - <frame index="2" offsetX="-3" offsetY="-32" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-26" delay="420"/> + <frame index="2" offsetX="-4" offsetY="-29" delay="140"/> <end/> </animation> <animation direction="right"> @@ -214,8 +214,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-29" delay="280"/> - <frame index="2" offsetX="-2" offsetY="-27" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-26" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-24" delay="280"/> <end/> </animation> <animation direction="right"> diff --git a/graphics/sprites/equipment/head/wizard-hat-female.xml b/graphics/sprites/equipment/head/wizard-hat-female.xml index f09aa09d..d1fec671 100644 --- a/graphics/sprites/equipment/head/wizard-hat-female.xml +++ b/graphics/sprites/equipment/head/wizard-hat-female.xml @@ -9,7 +9,7 @@ <frame index="1" offsetX="0" offsetY="-31"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-1" offsetY="-27"/> + <frame index="2" offsetX="-2" offsetY="-27"/> </animation> <animation direction="right"> <frame index="3" offsetX="0" offsetY="-31"/> @@ -30,10 +30,10 @@ <frame delay="75" index="1" offsetX="0" offsetY="-31"/> </animation> <animation direction="up"> - <frame delay="75" index="2" offsetX="-1" offsetY="-27"/> - <frame delay="150" index="2" offsetX="-1" offsetY="-28"/> - <frame delay="75" index="2" offsetX="-1" offsetY="-27"/> - <frame delay="150" index="2" offsetX="-1" offsetY="-28"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-27"/> + <frame delay="150" index="2" offsetX="-2" offsetY="-28"/> + <frame delay="75" index="2" offsetX="-2" offsetY="-27"/> + <frame delay="150" index="2" offsetX="-2" offsetY="-28"/> </animation> <animation direction="right"> <frame delay="75" index="3" offsetX="0" offsetY="-31"/> @@ -59,8 +59,8 @@ <end/> </animation> <animation direction="up"> - <frame delay="225" index="2" offsetX="-2" offsetY="-27"/> - <frame delay="75" index="2" offsetX="-2" offsetY="-25"/> + <frame delay="225" index="2" offsetX="-3" offsetY="-27"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-25"/> <end/> </animation> <animation direction="right"> @@ -84,9 +84,9 @@ <end/> </animation> <animation direction="up"> - <frame delay="225" index="2" offsetX="-1" offsetY="-27"/> - <frame delay="75" index="2" offsetX="-2" offsetY="-26"/> - <frame delay="75" index="2" offsetX="-2" offsetY="-27"/> + <frame delay="225" index="2" offsetX="-2" offsetY="-27"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-26"/> + <frame delay="75" index="2" offsetX="-3" offsetY="-27"/> <end/> </animation> <animation direction="right"> @@ -103,7 +103,7 @@ <frame index="1" offsetX="4" offsetY="-22"/> </animation> <animation direction="up"> - <frame index="2" offsetX="0" offsetY="-19"/> + <frame index="2" offsetX="-1" offsetY="-19"/> </animation> <animation direction="right"> <frame index="3" offsetX="-6" offsetY="-22"/> @@ -130,9 +130,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-3" offsetY="-26" delay="280"/> - <frame index="2" offsetX="-3" offsetY="-24" delay="140"/> - <frame index="2" offsetX="-2" offsetY="-27" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-26" delay="280"/> + <frame index="2" offsetX="-4" offsetY="-24" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-27" delay="140"/> <end/> </animation> <animation direction="right"> @@ -159,8 +159,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-27" delay="300"/> - <frame index="2" offsetX="-2" offsetY="-25" delay="100"/> + <frame index="2" offsetX="-3" offsetY="-27" delay="300"/> + <frame index="2" offsetX="-3" offsetY="-25" delay="100"/> <end/> </animation> <animation direction="right"> @@ -186,10 +186,10 @@ <end/> </animation> <animation direction="up"> + <frame index="2" offsetX="-5" offsetY="-27" delay="140"/> <frame index="2" offsetX="-4" offsetY="-27" delay="140"/> - <frame index="2" offsetX="-3" offsetY="-27" delay="140"/> - <frame index="2" offsetX="-3" offsetY="-26" delay="140"/> - <frame index="2" offsetX="-4" offsetY="-31" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-26" delay="140"/> + <frame index="2" offsetX="-5" offsetY="-31" delay="140"/> <end/> </animation> <animation direction="right"> @@ -214,9 +214,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-3" offsetY="-26" delay="140"/> - <frame index="2" offsetX="-3" offsetY="-25" delay="280"/> - <frame index="2" offsetX="-3" offsetY="-24" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-26" delay="140"/> + <frame index="2" offsetX="-4" offsetY="-25" delay="280"/> + <frame index="2" offsetX="-4" offsetY="-24" delay="140"/> <end/> </animation> <animation direction="right"> diff --git a/graphics/sprites/equipment/head/wizard-hat.xml b/graphics/sprites/equipment/head/wizard-hat.xml index 2beec166..f5259c95 100644 --- a/graphics/sprites/equipment/head/wizard-hat.xml +++ b/graphics/sprites/equipment/head/wizard-hat.xml @@ -9,7 +9,7 @@ <frame index="1" offsetX="0" offsetY="-31"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-1" offsetY="-27"/> + <frame index="2" offsetX="-2" offsetY="-27"/> </animation> <animation direction="right"> <frame index="3" offsetX="0" offsetY="-31"/> @@ -30,10 +30,10 @@ <frame index="1" offsetX="0" offsetY="-31" delay="75"/> </animation> <animation direction="up"> - <frame index="2" offsetX="-1" offsetY="-27" delay="75"/> - <frame index="2" offsetX="-1" offsetY="-28" delay="150"/> - <frame index="2" offsetX="-1" offsetY="-27" delay="75"/> - <frame index="2" offsetX="-1" offsetY="-28" delay="150"/> + <frame index="2" offsetX="-2" offsetY="-27" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-28" delay="150"/> + <frame index="2" offsetX="-2" offsetY="-27" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-28" delay="150"/> </animation> <animation direction="right"> <frame index="3" offsetX="0" offsetY="-31" delay="75"/> @@ -59,8 +59,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-27" delay="225"/> - <frame index="2" offsetX="-2" offsetY="-25" delay="75"/> + <frame index="2" offsetX="-3" offsetY="-27" delay="225"/> + <frame index="2" offsetX="-3" offsetY="-25" delay="75"/> <end/> </animation> <animation direction="right"> @@ -84,9 +84,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-1" offsetY="-27" delay="225"/> - <frame index="2" offsetX="-2" offsetY="-26" delay="75"/> - <frame index="2" offsetX="-2" offsetY="-27" delay="75"/> + <frame index="2" offsetX="-2" offsetY="-27" delay="225"/> + <frame index="2" offsetX="-3" offsetY="-26" delay="75"/> + <frame index="2" offsetX="-3" offsetY="-27" delay="75"/> <end/> </animation> <animation direction="right"> @@ -103,7 +103,7 @@ <frame index="1" offsetX="4" offsetY="-22"/> </animation> <animation direction="up"> - <frame index="2" offsetX="0" offsetY="-19"/> + <frame index="2" offsetX="-1" offsetY="-19"/> </animation> <animation direction="right"> <frame index="3" offsetX="-6" offsetY="-22"/> @@ -130,9 +130,9 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-27" delay="280"/> - <frame index="2" offsetX="-2" offsetY="-25" delay="140"/> - <frame index="2" offsetX="-1" offsetY="-28" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-27" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-25" delay="140"/> + <frame index="2" offsetX="-2" offsetY="-28" delay="140"/> <end/> </animation> <animation direction="right"> @@ -159,8 +159,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-27" delay="300"/> - <frame index="2" offsetX="-2" offsetY="-25" delay="100"/> + <frame index="2" offsetX="-3" offsetY="-27" delay="300"/> + <frame index="2" offsetX="-3" offsetY="-25" delay="100"/> <end/> </animation> <animation direction="right"> @@ -186,8 +186,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-27" delay="420"/> - <frame index="2" offsetX="-3" offsetY="-30" delay="140"/> + <frame index="2" offsetX="-3" offsetY="-27" delay="420"/> + <frame index="2" offsetX="-4" offsetY="-30" delay="140"/> <end/> </animation> <animation direction="right"> @@ -214,8 +214,8 @@ <end/> </animation> <animation direction="up"> - <frame index="2" offsetX="-2" offsetY="-27" delay="280"/> - <frame index="2" offsetX="-2" offsetY="-25" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-27" delay="280"/> + <frame index="2" offsetX="-3" offsetY="-25" delay="280"/> <end/> </animation> <animation direction="right"> diff --git a/items/equip-head/item5267_AssassinMask.xml b/items/equip-head/item5267_AssassinMask.xml index b067967f..ad285f11 100644 --- a/items/equip-head/item5267_AssassinMask.xml +++ b/items/equip-head/item5267_AssassinMask.xml @@ -8,6 +8,7 @@ </its:rules> <item id="5267" image="equipment/head/assassin-mask.png" name="Assassin Mask" description="Mask for a master assassin." type="equip-head" effect="Double Damage +15% / Attack Speed +15%" defense="6" agi="9" dex="1" maxhp="70" mattack="-5" mdefense="5" criticalattack="15" weight="10" sellProtected="true"> <sprite gender="unisex">equipment/head/assassin-mask.xml</sprite> + <sprite gender="female">equipment/head/assassin-mask-female.xml</sprite> <replace sprite="hair"> <item to="-1"/> </replace> diff --git a/items/equip-head/item759_PaladinsHelmet.xml b/items/equip-head/item759_PaladinsHelmet.xml index 6df2d168..f5cecbd9 100644 --- a/items/equip-head/item759_PaladinsHelmet.xml +++ b/items/equip-head/item759_PaladinsHelmet.xml @@ -9,5 +9,8 @@ <item id="759" image="equipment/head/paladin-helm.png" name="Paladin's Helmet" description="Worn only by paladins." type="equip-head" defense="19" weight="43"> <sprite gender="unisex">equipment/head/paladinhelm.xml</sprite> <sprite gender="female">equipment/head/paladinhelm-female.xml</sprite> + <replace sprite="hair"> + <item to="-1"/> + </replace> </item> </items> diff --git a/items/equip-head/item760_OverlordsHelmet.xml b/items/equip-head/item760_OverlordsHelmet.xml index 9fc943f7..e7578ed5 100644 --- a/items/equip-head/item760_OverlordsHelmet.xml +++ b/items/equip-head/item760_OverlordsHelmet.xml @@ -9,5 +9,8 @@ <item id="760" image="equipment/head/overlord-helm.png" name="Overlord's Helmet" description="Worn by the greatest warriors." type="equip-head" defense="50" weight="45"> <sprite gender="unisex">equipment/head/overlordhelm.xml</sprite> <sprite gender="female">equipment/head/overlordhelm-female.xml</sprite> + <replace sprite="hair"> + <item to="-1"/> + </replace> </item> </items> @@ -150,6 +150,8 @@ File | Artists | Licenses `graphics/items/equipment/charms/heartnecklace.png` | Jetryl | GPLv2 `graphics/items/equipment/charms/skeletoncharm.png` | Cassy, Jetryl | GPLv2 `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 #### Chest File | Artists | Licenses @@ -279,6 +281,7 @@ File | Artists | Licenses `graphics/items/equipment/head/pipe.png` | Veryape | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/head/terranite-head.png` | gumi, Kr0n05931 | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/head/shades.png` | jak1 | GPLv2, CC BY-SA 3.0 +`graphics/items/equipment/head/assassin-mask.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 #### Legs File | Artists | Licenses @@ -298,6 +301,7 @@ File | Artists | Licenses `graphics/items/equipment/rings/magic.png` | Nami | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/rings/simple.png` | Salmondine | GPLv2 `graphics/items/equipment/rings/wedding.png` | Kess | GPLv2 +`graphics/items/equipment/rings/assassin-ring.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 #### Shields File | Artists | Licenses @@ -608,6 +612,7 @@ File | Artists | Licenses `graphics/particles/star-medium.png` | Crush | GPLv2, CC BY-SA 3.0 `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 ### Skills @@ -674,6 +679,7 @@ File | Artists | Licenses `graphics/sprites/equipment/weapons/sword-short.png` | ChefChelios, Wushin | GPLv2, CC BY-SA 3.0 `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 #### Chest File | Artists | Licenses @@ -829,6 +835,8 @@ File | Artists | Licenses `graphics/sprites/equipment/head/yeti-mask.png` | Skipy | GPLv2 `graphics/sprites/equipment/head/pipe.png` | Veryape | GPLv2, CC BY-SA 3.0 `graphics/sprites/equipment/head/shades.png` | jak1 | GPLv2, CC BY-SA 3.0 +`graphics/sprites/equipment/head/assassin-mask.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0 + #### Legs File | Artists | Licenses diff --git a/maps/001-1.tmx b/maps/001-1.tmx index 647be4a9..adceb3c0 100644 --- a/maps/001-1.tmx +++ b/maps/001-1.tmx @@ -143,8 +143,8 @@ 1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1716,1698,3,118,3,3,3,3,3,3,3,3,3,3,216,217,3,3,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,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, 1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1716,1698,3,134,118,3,3,3,3,3,120,121,121,121,216,217,11,3,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,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, 1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1716,1698,3,150,134,135,135,135,135,135,136,137,137,137,216,217,3,3,3,3,3,339,3,3,404,404,404,3,3,347,3,3,3,3,339,955,955,955,955,955,955,955,955,955,955,347,955,955,339,955,955,955,955,955,955,955,955,955,3,347,3,339,3,3,404,404,404,3,3,347,3,3,3,3,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, -1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1716,1698,149,150,150,151,151,151,151,151,151,409,137,137,216,217,364,364,364,364,364,355,3,3,404,404,404,3,3,363,364,364,364,364,355,3,955,955,955,955,955,955,955,955,955,363,364,364,355,955,955,955,955,955,955,955,955,955,3,364,364,355,3,3,404,404,404,3,3,363,364,364,364,364,364,364,364,364,364,364,364,364,216,217,151,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, -1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1713,1687,166,150,151,151,151,151,151,152,425,153,153,216,217,380,380,380,380,380,371,3,3,404,404,404,3,3,379,380,380,380,380,371,3,955,955,955,955,955,955,955,955,3,379,380,380,371,3,955,955,955,955,955,955,955,955,3,380,380,371,3,3,404,404,404,3,3,379,380,380,380,380,380,380,380,380,380,380,380,380,216,217,151,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, +1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1716,1698,149,150,150,151,151,151,151,151,151,409,137,137,216,217,364,364,364,364,364,355,3,3,404,404,404,3,3,363,364,364,364,364,355,3,955,955,955,955,955,955,955,955,955,363,364,364,355,955,955,955,955,955,955,955,955,955,3,363,364,355,3,3,404,404,404,3,3,363,364,364,364,364,364,364,364,364,364,364,364,364,216,217,151,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, +1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1713,1687,166,150,151,151,151,151,151,152,425,153,153,216,217,380,380,380,380,380,371,3,3,404,404,404,3,3,379,380,380,380,380,371,3,955,955,955,955,955,955,955,955,3,379,380,380,371,3,955,955,955,955,955,955,955,955,3,379,380,371,3,3,404,404,404,3,3,379,380,380,380,380,380,380,380,380,380,380,380,380,216,217,151,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1698,3,166,167,167,167,167,167,168,441,170,3,216,217,3,3,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,3,3,955,955,955,955,955,955,955,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,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, 1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1716,1698,3,3,3,3,395,399,400,3,3,3,3,216,217,3,3,606,606,606,608,3,3,404,404,404,3,3,3,3,3,3,3,3,3,955,955,955,955,955,955,3,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,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, 1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1735,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1726,1716,1716,1698,3,3,3,3,411,428,413,3,3,3,3,216,217,3,3,605,605,605,606,3,3,404,404,404,3,3,3,3,3,3,3,3,3,955,955,955,955,955,955,3,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,3,3,352,353,354,3,404,404,404,3,3,352,353,354,3,3,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, diff --git a/maps/002-1.tmx b/maps/002-1.tmx index bafe15c9..db56eea3 100644 --- a/maps/002-1.tmx +++ b/maps/002-1.tmx @@ -49,8 +49,8 @@ 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,1422,1412,1394,3,118,3,3,3,3,3,3,3,3,3,3,216,217,3,3,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,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, 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,1422,1412,1394,3,134,118,3,3,3,3,3,120,121,121,121,216,217,3,3,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,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, 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,1422,1412,1394,3,150,134,135,135,135,135,135,136,137,137,137,216,217,3,3,3,3,3,339,3,3,404,404,404,3,3,347,3,3,3,3,339,955,955,955,955,955,955,955,955,955,955,347,955,955,339,955,955,955,955,955,955,955,955,955,3,347,3,339,3,3,404,404,404,3,3,347,3,3,3,3,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, -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,1422,1412,1394,149,150,150,151,151,151,151,151,151,409,137,137,216,217,364,364,364,364,364,355,3,3,404,404,404,3,3,363,364,364,364,364,355,3,955,955,955,955,955,955,955,955,955,363,364,364,355,955,955,955,955,955,955,955,955,955,3,364,364,355,3,3,404,404,404,3,3,363,364,364,364,364,364,364,364,364,364,364,364,364,216,217,151,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,1431,1431,1431,1431,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1409,1383,166,150,151,151,151,151,151,152,425,153,153,216,217,380,380,380,380,380,371,3,3,404,404,404,3,3,379,380,380,380,380,371,3,955,955,955,955,955,955,955,955,3,379,380,380,371,3,955,955,955,955,955,955,955,955,3,380,380,371,3,3,404,404,404,3,3,379,380,380,380,380,380,380,380,380,380,380,380,380,216,217,151,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,1431,1431,1431,1431,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1412,1394,149,150,150,151,151,151,151,151,151,409,137,137,216,217,364,364,364,364,364,355,3,3,404,404,404,3,3,363,364,364,364,364,355,3,955,955,955,955,955,955,955,955,955,363,364,364,355,955,955,955,955,955,955,955,955,955,3,363,364,355,3,3,404,404,404,3,3,363,364,364,364,364,364,364,364,364,364,364,364,364,216,217,151,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,1431,1431,1431,1431,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1409,1383,166,150,151,151,151,151,151,152,425,153,153,216,217,380,380,380,380,380,371,3,3,404,404,404,3,3,379,380,380,380,380,371,3,955,955,955,955,955,955,955,955,3,379,380,380,371,3,955,955,955,955,955,955,955,955,3,379,380,371,3,3,404,404,404,3,3,379,380,380,380,380,380,380,380,380,380,380,380,380,216,217,151,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,1431,1431,1431,1431,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1394,3,166,167,167,167,167,167,168,441,170,3,216,217,3,3,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,3,3,955,955,955,955,955,955,955,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,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, 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,1422,1422,1412,1394,3,3,3,3,395,399,400,3,3,3,3,216,217,3,3,606,606,606,608,3,3,404,404,404,3,3,3,3,3,3,3,3,3,955,955,955,955,955,955,3,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,3,3,3,3,3,3,404,404,404,3,3,3,3,3,3,3,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, 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,1422,1412,1412,1394,3,3,3,3,411,428,413,3,3,3,3,216,217,3,3,605,605,605,606,3,3,404,404,404,3,3,3,3,3,3,3,3,3,955,955,955,955,955,955,3,3,3,3,3,3,3,3,955,955,955,955,955,955,955,955,3,3,352,353,354,3,404,404,404,3,3,352,353,354,3,3,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, @@ -766,7 +766,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,89,89,89,90,0,85,89,90,0,0,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,261,262,263,264,265,260,260,260,260,260,260,260,260,260,260,260,260,260,260,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,88,3,3,3,3,3,86,3,3,106,0,0,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,276,277,278,279,280,281,276,276,276,276,276,276,276,276,276,276,276,276,276,276,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,85,89,3,3,0,0,0,3,3,3,3,106,0,0,298,298,298,298,298,298,292,293,294,295,296,297,298,298,298,298,298,298,332,292,293,294,295,296,294,295,296,297,298,298,298,298,298,292,293,294,295,296,294,295,296,297,298,298,298,298,292,293,294,295,296,297,298,298,298,298,298,298,298,298,298,298,298,298,298,298,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,3,3,0,0,0,0,0,0,0,3,106,0,0,298,298,298,298,298,307,308,320,320,311,320,320,314,315,298,298,298,298,307,308,309,310,311,312,310,311,312,313,314,315,298,298,307,308,309,310,311,312,310,311,312,313,315,315,298,307,308,320,320,311,320,320,314,315,298,298,298,298,298,298,298,298,298,298,298,298,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,3,3,0,0,0,0,0,0,0,3,106,0,0,298,298,298,298,298,307,308,320,320,311,320,320,314,315,298,298,298,298,307,308,309,310,311,312,310,311,312,313,314,315,298,298,307,308,309,310,311,312,310,311,312,313,314,315,298,307,308,320,320,311,320,320,314,315,298,298,298,298,298,298,298,298,298,298,298,298,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,332,332,332,332,332,323,320,320,320,320,320,320,320,331,332,332,332,332,323,324,325,326,327,328,326,327,328,329,330,331,332,332,323,324,325,326,327,328,326,327,328,329,330,331,332,323,320,320,320,320,320,320,320,331,298,298,298,298,298,298,298,298,298,298,298,298,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,348,348,348,348,348,339,336,336,336,336,336,336,336,347,348,348,348,348,339,340,0,0,0,0,0,0,0,0,346,347,348,348,339,340,0,0,0,0,0,0,0,0,346,347,348,339,336,336,336,336,336,336,336,347,348,348,348,348,348,348,348,348,348,348,348,348,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,0,0,362,0,0,0,0,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,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/maps/011-1.tmx b/maps/011-1.tmx index a019d285..5eb3eabd 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.0" orientation="orthogonal" renderorder="right-down" width="154" height="124" tilewidth="32" tileheight="32" nextobjectid="23"> +<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"> <properties> <property name="minimap" value="graphics/minimaps/011-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -16,7 +16,7 @@ <tileset firstgid="323" source="../tilesets/woodland_village.tsx"/> <tileset firstgid="579" source="../tilesets/woodland_indoor.tsx"/> <tileset firstgid="835" source="../tilesets/woodland_village_x2.tsx"/> - <layer name="Ground1" width="154" height="124"> + <layer id="1" name="Ground1" width="154" height="124"> <data encoding="csv"> 3,3,3,3,3,3,213,213,214,215,215,215,215,215,216,217,201,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,89,89,124,153,217,201,185,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,19,19,19,19,19,19,89,89,90,19,69,71,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,67,67,67,19,19,233,19,19,19,19,19,19,19,19,19,19,19,19,19,3,19,19,233,218,183,212,198,199,199,199,215,215,215,215,215,216,234,199,199,199,199,215,244,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,88,89,89,89,89,90, 19,19,19,19,19,19,213,229,3,3,3,3,3,3,3,233,217,217,19,19,19,19,19,19,19,19,19,19,19,19,76,77,78,19,19,67,19,89,89,89,153,217,201,185,3,3,19,19,51,19,19,19,19,19,69,70,70,70,71,19,51,19,19,19,89,89,90,69,100,87,19,19,19,19,19,51,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,250,199,228,198,199,199,199,184,185,51,51,51,51,250,199,199,199,199,184,185,3,3,3,3,3,3,3,3,3,3,3,3,181,3,3,3,3,3,3,127,40,89,89,89,89,41, @@ -144,7 +144,7 @@ 101,102,102,102,102,102,102,102,102,102,102,102,102,102,103,3,104,176,56,89,89,89,90,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,19,3,3,3,3,3,67,67,3,67,67,67,3,3,3,3,3,3,3,3,3,3,3,3,121,73,73,125,3,3,3,3,51,51,3,92,93,94,143,89,145,90,3,3,3,3,3,3,3,3,3,3,3,3,101,84,86,87,3,3,3,3,3,201,185,3,181,3,3,3,3,3,3,3,3,3,3,3,138,139,89,89,90,51,51,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,85,86,86,86,86,86,86,86,87,3 </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,202,0,0,187,0,0,0,0,0,0,0,0,0,0,0,248,232,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,187,0,0,117,16,16,15,559,95,97,559,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,179,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,249,0,0,0,186,232,0,0,0,0,0,0,0,0,0,179,0,0,187,0,0,0,0,0,0,0,0,0,0,0,0,171,0,18,0,171,0,0,0,0,0,0,0,230,180,0,17,0,0,0,117,0,0,0,0,0,0,0,17,0,0,0,187,0,0,16,16,16,116,559,95,97,559,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,0,116,0,0,0,0,0,0,0,195,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,134,0,0,0,0, @@ -174,7 +174,7 @@ 0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,187,0,227,0,0,0,235,95,97,195,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,0,0,0,0,0,489,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,20,16,18,20,18,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,34,0,0,0,0,34,0,0,34,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,203,0,227,0,0,0,235,95,97,211,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,489,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,20,32,34,52,4,4,14,14,4,5,0,115, 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,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,219,0,227,0,0,0,235,95,97,227,0,0,0,0,0,0,0,0,0,0,0,0,502,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,508,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,53,4,4,21,0,0,26,26,0,20,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,179,0,0,0,34,0,0,0,0,0,0,34,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,235,0,227,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,561,576,518,490,0,0,0,0,0,0,0,0,0,0,0,473,490,0,490,0,490,524,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,133,0,0,0,0,0,0,444,445,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,179,0,0,0,34,0,0,0,0,0,0,34,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,235,0,227,0,0,0,0,95,97,0,0,0,0,0,0,0,0,0,0,0,561,576,545,490,0,0,0,0,0,0,0,0,0,0,0,473,490,0,490,0,490,524,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,133,0,0,0,0,0,0,444,445,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,179,0,0,0,0,0,0,0,0,34,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,79,64,97,0,0,0,0,0,0,0,0,0,0,0,559,459,518,0,0,0,0,0,0,0,0,0,0,0,0,489,0,0,0,0,0,524,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,34,34,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,179,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,95,96,97,561,576,576,546,576,576,576,576,546,576,576,577,459,518,490,0,0,0,0,0,492,0,0,0,0,0,489,490,0,0,0,490,524,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,15,20,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,164,167,167,167,170,0,187,0,179,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,95,96,97,559,0,0,502,0,0,0,0,0,508,0,0,0,534,518,0,0,0,0,0,0,0,0,0,0,0,489,0,0,0,0,0,540,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,135,0,0,0,0,0,20,0,0, @@ -272,7 +272,7 @@ 0,0,0,0,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,76,62,45,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,19,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 </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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,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,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,291,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, @@ -302,7 +302,7 @@ 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,0,0,0,0,0,0,0,0,0,0,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,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,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,291,292,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 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,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,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,0,0,0,0,291,292,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,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,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,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,0,0,0,0,0,0,0,0,473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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, 0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,268,0,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,293,294,0,0,0,0,268,268,268,0,0,0,0,0,0,0,0,0,0,0,0,0,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,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0, @@ -400,7 +400,7 @@ 291,292,291,292,266,267,291,292,0,291,292,0,266,267,291,292,0,0,0,0,0,0,0,293,294,0,0,0,0,0,0,0,0,0,0,0,293,294,0,0,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,293,294,0,0,0,293,294,0,0,0,0,0,0,0,291,292,0,0,293,294,0,0,0,0,0,0,268,268,268,268,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,291,292,0,0,293,294,0,0,293,294,0,0,0,0,0,0,268,268,268,268,268,268,268,268,268,0 </data> </layer> - <layer name="Over1" width="154" height="124"> + <layer id="4" name="Over1" width="154" height="124"> <data encoding="csv"> 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,171,0,0,0,0,0,0,0,0,0,0,0, @@ -430,7 +430,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,452,452,340,356,390,390,391,392,392,345,346,453,453,453,453,453,453,453,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,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,0,451,452,340,356,390,390,390,391,392,392,392,345,346,453,453,453,453,453,453,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,0,0,0,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,355,356,390,390,390,390,391,392,392,392,392,362,363,469,469,469,469,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,545,404,390,390,390,390,390,391,392,392,392,392,392,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,404,390,390,390,390,390,391,392,392,392,392,392,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,0,0,0,435,436,436,436,436,436,438,0,0,0,0,404,390,390,390,390,406,407,408,392,392,392,392,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,164,167,167,167,167,167,167,167,167,167,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,451,452,452,452,452,452,454,0,0,0,0,404,390,390,406,421,422,0,424,425,408,392,392,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,0,0,0,467,468,468,468,468,468,470,0,0,0,0,404,406,421,422,0,0,0,0,0,424,425,408,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, @@ -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,227,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 </data> </layer> - <layer name="Collision" width="154" height="124"> + <layer id="5" 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, @@ -559,7 +559,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,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,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,0,0,0,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,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,2,2,2,2,2,0,0,2,2,0,0,2,2,0,0,0,0,0,2,2,2,0,0,0,0,0,0,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,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,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,2,2,0,2,2,2,0,0,0,0,0,0,2,0,0,0,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,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,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,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,2,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,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, @@ -656,7 +656,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 </data> </layer> - <objectgroup name="Objects"> + <objectgroup id="6" name="Objects"> <object id="1" name="graphics/particles/waterfall.particle.xml" type="particle_effect" x="2112" y="930" width="32" height="32"/> <object id="2" name="graphics/particles/geyser.particle.xml" type="particle_effect" x="2176" y="1376" width="32" height="32"/> <object id="3" name="To Hermit's Cave" type="warp" x="1856" y="2944" width="32" height="32"> diff --git a/maps/012-4.tmx b/maps/012-4.tmx index 4ffcfcd0..58171459 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.0" orientation="orthogonal" renderorder="right-down" width="520" height="210" tilewidth="32" tileheight="32" nextobjectid="94"> +<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"> <properties> <property name="music" value="cavesong.ogg"/> <property name="name" value="Terranite Cave"/> @@ -11,7 +11,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="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,41,40,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,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, 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,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,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,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, @@ -110,9 +110,9 @@ 23,23,23,23,23,23,23,24,128,129,129,129,129,129,95,113,113,113,113,113,113,110,97,98,7,7,7,7,7,7,54,55,53,69,109,68,52,36,39,39,39,39,20,23,23,23,21,37,55,55,59,23,23,23,23,23,23,23,23,23,23,57,56,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,38,39,40,112,113,113,94,129,130,6,23,8,128,129,129,129,129,95,113,113,113,113,110,97,97,111,113,114,109,70,71,71,71,52,55,36,20,23,23,73,72,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,57,56,7,7,7,121,7,7,7,7,7,7,7,38,39,39,39,39,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,71,69,7,96,98,7,96,97,97,111,113,113,110,97,98,7,7,7,7,7,7,7,7,7,7,7,7,123,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,8,7,7,7,7,7,126,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,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,112,113,114,7,7,112,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,110,97,97,111,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,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,94,129,95,94,130,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,8,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,8,128,129,129,129,129,95,94,129,129,110,97,98,7,96,98,121,70,71,69,7,7,7,68,52,55,55,55,55,36,39,39,39,37,53,71,71,38,39,20,23,23,23,23,23,23,23,23,73,72,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,54,55,56,112,113,113,114,6,23,23,23,23,8,7,7,7,7,128,95,94,129,129,95,129,129,129,95,110,98,123,96,97,98,68,71,52,36,20,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,73,72,7,7,7,7,7,7,7,7,7,7,7,54,55,55,55,55,36,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,21,39,40,7,7,7,112,110,97,111,113,113,113,113,113,113,113,110,98,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,122,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,24,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,24,7,7,7,7,7,7,7,7,7,122,7,7,7,7,7,7,7,7,96,111,113,114,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,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,114,7,128,130,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,24,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,8,128,130,6,8,112,113,110,97,111,110,97,97,97,97,97,97,98,122,68,71,71,71,71,52,55,55,55,53,69,7,7,54,55,36,39,39,39,39,43,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,70,71,72,112,94,129,130,22,23,23,23,23,23,23,23,23,23,8,128,130,6,8,130,7,126,7,128,129,110,97,111,113,110,97,98,68,52,36,39,40,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,21,40,7,7,7,7,7,7,7,7,7,7,7,7,70,71,71,71,71,52,36,39,39,20,23,23,23,23,23,23,23,23,23,23,23,21,37,55,56,7,7,7,128,129,95,113,113,113,94,129,95,113,113,113,114,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,8,7,7,7,7,7,7,121,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,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,112,113,113,110,97,97,111,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,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,94,130,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,24,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,24,128,129,129,129,129,129,95,113,113,113,113,113,110,97,97,97,97,98,121,68,71,71,71,69,7,7,7,70,71,52,55,55,55,55,59,23,21,39,40,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,96,97,111,114,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,128,129,129,95,113,113,110,98,68,52,55,56,7,7,7,7,123,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,41,37,56,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,52,55,55,36,20,23,23,23,23,23,23,23,23,23,21,37,53,71,72,7,7,7,7,7,112,113,113,113,114,7,128,95,113,113,110,98,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,8,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,24,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,96,97,111,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,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,94,129,130,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,24,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,24,128,129,129,129,129,129,95,113,113,113,113,113,110,97,97,97,97,98,121,68,71,71,71,69,7,7,7,70,71,52,55,55,55,55,59,23,21,39,40,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,96,97,111,114,6,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,128,129,129,95,113,113,110,98,68,52,55,56,7,7,7,7,123,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,41,37,56,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,52,55,55,36,20,23,23,23,23,23,23,23,23,23,21,37,53,71,72,7,7,7,7,7,112,113,113,113,114,7,128,95,113,113,110,98,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,8,7,7,7,7,7,109,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,24,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,96,97,111,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,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,94,129,130,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,24,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,8,128,129,129,129,95,113,113,113,113,113,113,110,97,97,97,97,97,97,97,98,7,7,7,68,71,71,71,71,38,39,37,55,56,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,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,8,128,129,129,95,114,7,68,71,72,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,57,53,72,7,7,7,7,7,7,123,7,7,7,7,7,7,7,7,7,7,7,68,71,71,52,36,20,23,23,23,23,21,39,39,39,37,53,69,96,97,97,97,98,7,96,111,94,129,129,130,7,7,112,113,113,94,130,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,8,7,7,7,7,7,7,7,7,7,109,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,24,7,7,7,7,7,7,7,7,7,7,7,7,7,96,97,111,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,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,94,130,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,8,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,8,128,129,129,129,129,129,129,129,95,113,113,113,113,113,113,110,97,98,123,7,7,7,7,7,54,55,53,71,72,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,96,111,94,129,130,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,8,112,110,98,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,73,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,7,7,68,52,36,39,20,23,21,37,55,55,55,53,69,96,111,113,113,113,110,97,111,94,130,7,7,7,7,96,111,113,113,114,6,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,23,23,8,7,7,7,109,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,24,7,7,7,7,7,7,7,7,7,7,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,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,94,130,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,24,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,8,128,129,129,129,129,129,129,129,95,113,113,113,113,113,113,110,97,98,123,7,7,7,7,7,54,55,53,71,72,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,96,111,94,129,130,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,8,112,110,98,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,73,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,7,7,68,52,36,39,20,23,21,37,55,55,55,53,69,96,111,113,113,113,110,97,111,94,130,7,7,7,7,96,111,113,113,114,6,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,23,23,8,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,24,7,7,7,7,7,7,7,7,7,7,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,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,94,130,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,24,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,8,128,129,129,129,129,95,94,129,129,110,97,97,97,97,98,109,70,71,69,7,7,7,7,7,7,7,7,121,7,7,7,7,7,7,7,7,7,7,96,97,97,111,129,130,7,6,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,24,112,113,110,98,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,21,40,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,52,55,36,39,37,53,71,71,71,69,96,111,113,113,113,113,113,113,113,114,7,7,126,7,96,111,113,113,94,130,22,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,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,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,96,111,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,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,94,129,130,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,21,39,40,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,8,128,130,6,8,128,95,113,113,113,110,97,97,97,98,7,96,97,98,7,7,7,7,7,7,7,7,7,7,7,7,7,7,96,111,94,129,130,7,7,7,54,36,39,39,39,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,128,129,95,110,98,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,23,23,21,37,56,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,52,55,53,69,7,7,7,7,112,113,113,113,113,113,113,113,113,110,97,98,7,96,111,113,113,113,114,126,22,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,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,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,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,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,94,129,95,113,113,113,113,113,94,129,95,113,94,130,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,21,37,55,56,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,24,7,128,129,129,129,129,95,113,113,110,97,111,113,110,97,98,7,7,7,7,7,7,7,7,7,7,96,97,111,113,114,7,7,7,7,7,70,52,55,55,55,36,39,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,39,40,121,7,112,113,114,7,7,7,7,7,7,7,7,38,20,23,23,23,23,23,23,23,23,23,23,41,37,53,72,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,109,68,71,69,7,7,7,7,7,112,113,113,113,113,113,113,113,113,113,113,110,97,111,113,113,113,113,114,7,22,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,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,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,96,111,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,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,94,130,7,128,95,113,113,94,129,130,7,128,129,130,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,41,37,53,71,72,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, @@ -225,7 +225,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="Fringe" width="520" height="210"> + <layer id="2" 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, @@ -439,7 +439,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="3" 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, @@ -653,7 +653,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="4" 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, @@ -752,9 +752,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,2,2,2,2,2,2,2,2,2,2,0,2,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,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,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,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,0,0,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,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,0,0,0,2,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,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,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,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,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,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,0,0,0,2,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,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,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,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,0,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,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,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,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,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,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,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, +2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,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,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,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,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,2,2,2,2,2,2,2,2,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,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,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,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,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,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,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,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,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,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,2,2,2,2,2,2,2,2,2,2,2,2, -2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,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,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,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,2,2,2,2,2,2,2,2,2,2,2,2, +2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,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,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,0,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,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,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,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,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,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,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,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,0,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,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,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,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,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,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,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,0,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,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,0,0,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,0,0,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,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,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,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, @@ -867,7 +867,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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 Moggun Cave" type="warp" x="6176" y="1856" width="32" height="32"> <properties> <property name="dest_map" value="012-3"/> diff --git a/maps/013-3.tmx b/maps/013-3.tmx index f816db77..1cd18260 100644 --- a/maps/013-3.tmx +++ b/maps/013-3.tmx @@ -861,7 +861,7 @@ 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,2,0,0,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,2,2,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,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,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,0,0,0,0,0,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,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,2,2,2,2,2,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,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,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, +2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,0,0,2,0,0,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,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,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,2,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,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,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,0,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,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,0,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,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,0,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,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,2,2,2,2,2,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/018-1.tmx b/maps/018-1.tmx index d1ea9649..fe66ccaf 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.0" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" nextobjectid="47"> +<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"> <properties> <property name="minimap" value="graphics/minimaps/018-1.png"/> <property name="music" value="the-forest.ogg"/> @@ -9,10 +9,10 @@ <property name="overlay0scrollX" value="0.2"/> <property name="overlay0scrollY" value="0.1"/> <property name="overlay1image" value="graphics/images/ambient/warning.png"/> + <property name="overlay1mask" value="2"/> <property name="overlay1parallax" value="1.0"/> <property name="overlay1scrollX" value="1.2"/> <property name="overlay1scrollY" value="0.0"/> - <property name="overlay1mask" value="2"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/woodland_ground.tsx"/> @@ -21,7 +21,7 @@ <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"/> - <layer name="Ground1" width="200" height="120"> + <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, 19,19,19,19,19,19,19,213,89,89,89,89,89,89,89,89,89,89,89,19,19,19,19,19,19,243,217,19,43,44,19,19,19,89,89,89,89,89,89,89,89,124,73,129,73,40,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,89,89,145,140,105,105,106,19,19,19,19,19,19,88,146,85,99,71,19,19,19,19,19,19,19,19,19,19,19,59,60,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,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, @@ -145,7 +145,7 @@ 19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,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,90,3,3,3,3,3,3,3,3,3,3,3,3,85,99,71,416,417,417,417,417,417,417,417,417,417,417,417,417,417,417,418,3,3,3,3,400,401,401,401,401,401,401,401,401,401,401,401,401,401,401,402,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,35,51,3,3,3,51,35,67,51,35,3,3,3,69,70,70,71,3,88,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,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="200" height="120"> + <layer id="2" name="Ground2" width="200" height="120"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,194,0,0,0,0,0,0,0,243,201,202,0,166,165,232,0,0,0,194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,169,165,232,0,0,0,0,0,0,230,169,165,232,0,0,0,0,0,0,0,0,187,0,0,0,0,0,0,0,0,193,0,0,0,0,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,230,169,168,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,187,0,0,0,118,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,230,180,0,0,0,248,232,0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,246,0,0,166,165,232,0,0,0,230,246,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,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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, @@ -269,7 +269,7 @@ 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 </data> </layer> - <layer name="Fringe" width="200" height="120"> + <layer id="3" name="Fringe" width="200" height="120"> <data encoding="csv"> 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,265,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,265,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,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,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, @@ -393,7 +393,7 @@ 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,293,294,0,293,294,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,582,583,583,583,583,583,583,583,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="120"> + <layer id="4" name="Over1" width="200" height="120"> <data encoding="csv"> 0,0,179,0,0,0,0,187,187,0,0,0,0,0,0,0,0,0,230,169,168,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,230,169,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,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,169,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,179,0,0,0,0,187,186,232,0,0,0,0,0,0,230,169,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,167,167,167,167,165,232,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,248,232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,230,169,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,169,167,167,167,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, @@ -444,23 +444,23 @@ 179,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,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, 180,0,0,0,0,0,0,166,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,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,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,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,202,0,0,0,0,0,0,0,0,186,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,179,0,0,0,0,0,0,0,291,292,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,170,0,0,0,0,0,0,0,0,0,0,0,0,252,253,253,253,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,170,0,0,0,0,0,0,0,0,0,0,0,0,252,253,253,253,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,186,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,252,253,253,253,253,253,253,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,166,167,167,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,237,237,237,237,237,237,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,0,0,0,0,0,169,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,239,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -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,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, +246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,169,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,239,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,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,0,0,0,166,165,169,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,166,170,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,202,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,389,390,0,392,393,394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,202,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0, @@ -470,16 +470,16 @@ 230,180,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,404,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,0,0,0,0,0,0,0,0,0,0,0,0, 246,0,0,0,0,230,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,186,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,404,0,406,407,408,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,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,166,0,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,420,421,422,0,424,425,426,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,164,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,292,19,171,164,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,164,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,171,164,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,179,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,187,180,19,19,19,19,19,19,19,19,166,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,179,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,19,19,0,0,0,0,291,292,19,19,19,19,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,19,19,0,0,0,0,0,0,19,19,19,19,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,7 +517,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,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 </data> </layer> - <layer name="Over2" width="200" height="120"> + <layer id="5" name="Over2" width="200" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -568,23 +568,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -594,16 +594,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -641,7 +641,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="120"> + <layer id="6" name="Collision" width="200" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -765,7 +765,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" visible="0"> + <objectgroup id="7" name="Objects" visible="0"> <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"/> diff --git a/maps/025-1.tmx b/maps/025-1.tmx index cbde6f0f..efb79fbd 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.0" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" nextobjectid="20"> +<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"> <properties> <property name="minimap" value="graphics/minimaps/025-1.png"/> <property name="music" value="mystique-forest.ogg"/> @@ -17,7 +17,7 @@ <tileset firstgid="883" source="../tilesets/forest_cover.tsx"/> <tileset firstgid="983" source="../tilesets/trans_woodland_desert.tsx"/> <tileset firstgid="1111" source="../tilesets/forest.tsx"/> - <layer name="Ground1" width="150" height="120"> + <layer id="1" name="Ground1" width="150" height="120"> <data encoding="csv"> 3,3,67,3,51,3,67,3,35,67,67,3,35,3,67,3,3,3,3,67,3,67,67,67,67,3,3,3,3,3,3,3,3,3,19,19,3,3,3,101,84,86,71,3,3,69,86,86,86,86,86,87,3,3,3,3,3,67,3,67,3,67,3,19,3,3,3,3,67,19,19,3,3,51,85,86,86,71,3,3,51,3,3,19,3,3,3,3,3,67,51,3,3,19,19,3,3,3,3,3,3,19,3,3,3,3,67,19,19,3,3,3,3,3,35,3,19,3,19,3,3,3,3,3,3,3,127,40,89,89,89,89,89,142,3,3,51,67,3,3,3,3,35,3,35,3,3,3,35,3, 51,51,35,67,35,51,3,3,3,19,35,19,67,67,3,35,67,67,67,3,51,67,67,3,51,3,67,67,67,3,3,3,19,3,3,3,3,19,51,19,101,84,86,70,70,86,86,86,86,86,86,103,3,3,3,67,3,35,67,3,67,3,3,3,3,3,3,3,19,69,70,70,70,70,86,86,86,86,71,3,3,3,19,3,3,3,3,51,3,3,3,19,19,3,3,35,19,3,19,3,3,3,35,3,51,19,19,3,3,35,19,3,3,3,3,3,3,3,19,19,3,3,127,73,125,127,40,89,89,89,89,140,177,141,3,67,35,51,67,67,67,35,67,51,35,3,3,35,35,51, @@ -141,7 +141,7 @@ 3,3,67,51,19,19,51,19,19,67,19,19,35,19,19,19,35,35,3,19,67,51,19,3,19,35,3,67,19,19,19,67,3,35,51,35,19,35,51,3,19,3,3,19,19,51,35,19,67,19,35,19,67,19,51,35,35,19,67,19,67,3,35,3,35,35,3,3,67,35,67,67,67,3,67,3,3,3,67,51,67,3,67,35,67,35,67,67,51,51,35,51,35,35,35,35,3,35,35,3,19,3,35,67,3,51,51,35,3,3,3,35,51,51,19,51,51,35,35,35,3,51,51,51,35,19,35,51,35,88,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,124,126 </data> </layer> - <layer name="Ground2" width="150" height="120"> + <layer id="2" name="Ground2" width="150" 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,133,0,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,6,7,8,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,22,23,24,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,0,0,0,0,0,0,194,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,135,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 </data> </layer> - <layer name="Ground3" width="150" height="120"> + <layer id="3" name="Ground3" width="150" 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,7 +389,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="120"> + <layer id="4" name="Fringe" width="150" height="120"> <data encoding="csv"> 0,0,0,0,0,0,0,295,296,0,0,295,296,0,0,0,295,296,291,292,0,0,0,0,0,0,0,0,0,291,292,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,293,294,295,296,295,296,0,0,295,296,0,0,295,296,0,0,295,296,0,293,294,0,0,0,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, @@ -513,7 +513,7 @@ 0,0,0,0,0,0,293,294,0,0,0,0,0,291,292,582,583,584,0,579,580,581,293,294,0,291,292,0,0,579,580,581,0,0,0,295,296,0,579,580,581,293,294,0,293,294,0,0,0,585,586,587,291,292,0,585,586,587,0,0,0,0,0,0,0,293,294,0,295,296,0,0,0,291,292,0,291,292,0,293,294,0,0,0,0,295,296,579,580,581,293,294,579,580,581,0,0,0,0,295,296,0,0,0,585,586,587,582,583,584,293,294,0,0,0,0,0,0,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 </data> </layer> - <layer name="Over1" width="150" height="120"> + <layer id="5" name="Over1" width="150" 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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,403,405,405,405,405,405,405,390,391,392,392, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,403,405,405,405,405,405,405,390,391,392,392, @@ -637,7 +637,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="120"> + <layer id="6" 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, @@ -697,17 +697,17 @@ 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,2,0,0,2,2,0,0,2,2,2,2,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,2,2,0,0,0,0,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,0,2,2,0,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,0,0,0,2,0,0,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,2,2,0,2,2,2,0,0,0,2,2,0,2,2,0,0,0,2,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,2,2,2,2,2,2,2,0,0,0,0,0,2,2,0,2,2,2,2,2,2,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,0,0,0,0,0,0,0,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,2,2,0,0,2,0,0,0,0,0,0,2,2,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,0,0,0,0,0,0,2,2,0,2,2,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,0,0,0,2,2,2,0,0,0,0,2,2,0,2,2,0,0,0,0,0,0,0,0,0,2,2,0,0,0,2,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,2,2,2,0,0,0,0,2,2,0,2,2,0,0,0,0,0,2,0,0,0,0,2,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,0,0,0,0,0,0,0,2,2,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,0,0,0,2,2,2,0,0,0,0,2,2,0,2,2,0,0,0,0,0,0,0,0,0,2,2,0,0,0,2,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,2,2,2,0,0,0,0,2,2,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,0,0,0,0,0,0,0,2,2,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,0,0,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,2,0,0,2,2,2,2,2,0,0,2,2,0,2,0,2,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,2,0,0,0,0,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,0,0,2,2,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,0,2,2,2,2,2,0,0,0,2,2,0,0,0,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,0,0,0,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,2,2,2,2,2,2,0,0,0,0,0,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,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,2,2,2, 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,0,0,2,2,0,0,2,0,0,0,2,2,2,2,2,0,2,2,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,0,0,0,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,0,0,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,0,0,0,0,0,0,2,0,0,2,2,2,2,2,2,2,2,0,0,2,2,0,0,2,2,0,0,0,0,0,2,2,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,2,2,0,2,2,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,0,0,0,2,2,0,0,0,2,2,2,0,0,0,0,2,2,0,0,0,0,0,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,2,0,2,2,0,0,0,0,0,0,0,0,2,2,0,0,0,0,2,0,0,0,2,2,2,2,2,2,2,2,0,2,2,0,0,0,2,2,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,0,0,0,0,2,2,0,2,0,0,2,2,0,0,0,0,0,0,0,2,0,2,2,2,2,2,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,2,0,2,2,0,0,0,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,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,0,0,2,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,0,0,0,2,0,2,2,0,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,2,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,2,2,2,2,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,2,2,2,2,2,2,2,2,2,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,2,2,0,0,2,2,0,0,0,0,0,0,0,2,2,0,0,0,2,0,0,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,0,0,2,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,2,2,0,0,0,0,0,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,2,2,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,0,2,2,0,0,0,0,0,2,0,0,0,0,2,2,0,0,2,2,0,2,2,0,2,2,0,0,2,2,0,0,0,0,0,2,0,2,2,2,2,0,0,0,2,2,0,0,0,2,0,0,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,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,0,0,2,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,0,0,0,2,0,2,2,0,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,2,2,2,2,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,2,2,2,2,2,2,2,2,2,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,2,2,0,0,2,2,0,0,0,0,0,0,0,2,2,0,0,0,2,0,0,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,0,0,2,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,2,2,0,0,0,0,0,2,2,0,0,0,0,0,0,2,2,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,2,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,0,2,2,0,0,0,0,0,2,0,0,0,0,2,2,0,0,2,2,0,2,2,0,2,2,0,0,2,2,0,0,0,0,0,2,0,2,2,0,0,0,0,0,2,2,0,0,0,2,0,0,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,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,0,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,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,2,2,0,2,0,0,0,2,0,0,2,2,2,2,2,0,2,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,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, 2,2,2,2,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,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,2,2,0,0,2,2,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,2,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,2,0,0,0,0,0,2,2,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,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,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, @@ -739,7 +739,7 @@ 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,0,0,2,0,0,0,0,0,2,2,2,0,0,0,2,0,0,0,2,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,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,2,0,0,0,2,2,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,2,2,0,2,2,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,0,0,0,2,2,0,0,2,2,2,2,0,0,0,0,0,0,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,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,0,2,2,2,2,2,2,2,2,0,0,2,2,0,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,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,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,0,0,2,2,0,2,2,2,2,2,0,0,0,0,0,0,0,2,2,2,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,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,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,2,2,0,0,0,0,0,0,0,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,2,2,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,0,2,2,0,0,0,2,0,2,2,0,0,0,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,2,2,2,2,2,0,0,2,2,2,2,2,2,0,0,2,2,2,2,0,0,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,2,2, @@ -761,7 +761,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"> + <objectgroup id="7" name="Objects"> <object id="1" name="To Swamp" type="warp" x="608" y="2112" width="32" height="32"> <properties> <property name="dest_map" value="026-1"/> diff --git a/maps/031-1.tmx b/maps/031-1.tmx index 992a220e..50034935 100644 --- a/maps/031-1.tmx +++ b/maps/031-1.tmx @@ -1,13 +1,13 @@ <?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="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"> <properties> <property name="music" value="snow-village.ogg"/> <property name="name" value="Nivalis Port"/> <property name="overlay0image" value="graphics/images/ambient/warning.png"/> + <property name="overlay0mask" value="2"/> <property name="overlay0parallax" value="1.0"/> <property name="overlay0scrollX" value="1.2"/> <property name="overlay0scrollY" value="0.0"/> - <property name="overlay0mask" value="2"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> <tileset firstgid="3" source="../tilesets/snow.tsx"/> @@ -19,7 +19,8 @@ <tileset firstgid="616" source="../tilesets/snow_docks.tsx"/> <tileset firstgid="776" source="../tilesets/snow_village_x4.tsx"/> <tileset firstgid="786" source="../tilesets/snow_village_x3.tsx"/> - <layer name="Ground1" width="128" height="148"> + <tileset firstgid="796" source="../tilesets/snow_x4.tsx"/> + <layer id="1" name="Ground1" width="128" height="148"> <data encoding="csv"> 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,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,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,8,8,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560, 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,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,8,8,8,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560, @@ -98,9 +99,9 @@ 86,86,86,86,86,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,86,86,86,180,148,148,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,560,560,560,560,8,8,8,8,560,560,560,560,557,581,599,551,565,577,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, 86,86,86,86,86,86,86,86,86,86,86,86,86,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,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,560,560,560,560,560,8,8,8,8,8,560,560,560,560,546,599,562,539,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, 86,86,86,86,86,86,86,86,86,86,86,86,86,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,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,560,560,560,560,560,8,8,8,8,8,560,560,560,560,557,581,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, -69,69,69,69,69,69,69,69,69,69,69,69,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,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,560,560,560,8,8,8,8,8,8,8,8,560,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, -69,69,69,69,69,69,69,69,69,69,69,69,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,148,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,8,348,348,348,8,8,8,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, -69,69,69,69,69,69,69,69,69,69,69,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,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,348,348,348,560,560,560,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, +69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,560,560,560,8,8,8,8,8,8,8,8,560,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, +69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,8,8,8,8,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,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,8,348,348,348,8,8,8,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, +69,69,69,69,69,69,69,69,69,69,69,69,69,69,69,86,86,86,86,8,8,8,8,86,86,86,86,86,86,86,86,86,86,86,86,86,86,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,348,348,348,560,560,560,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, 69,69,69,69,69,69,69,69,69,69,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,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,348,348,348,560,560,560,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, 69,69,69,69,69,69,69,69,69,69,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,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,8,560,560,560,560,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, 69,69,69,69,69,69,69,69,69,69,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,148,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,8,8,8,8,8,8,8,8,560,560,8,8,8,8,8,560,560,546,599,551,554,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555, @@ -171,7 +172,7 @@ 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,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,560,555,555,555,555,555,555,555,555 </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,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,150,133,0,0,0,103,0,0,0,0,0,0,0,0,41,89,0,0,0,147,0,0,0,0,0,0,0,0,163,164,135,0,0,0,0,0,0,147,0,0,149,0,0,0,0,147,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,133,0,0,119,120,120,11,0,0,0,0,0,0,41,89,0,0,163,135,0,0,0,0,0,0,0,179,180,163,135,0,0,0,0,0,147,0,0,150,133,0,0,0,147,0,0,0,0,0,0,0,0, @@ -250,14 +251,14 @@ 0,0,0,0,35,93,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,95,35,0,0,0,0,0,0,0,0,0,0,0,195,147,0,0,0,0,0,0,0,0,0,0,150,133,196,196,197,0,0,0,0,0,0,0,0,0,0,0,0,149,181,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,9,121,0,0,0,0,103,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,54,52,52,52,52,52,52,52,53,16,17,18,54,52,52,52,52,52,52,52,38,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,149,197,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,105,0,0,0,0,0,103,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,0,0,0,0,0,0,0,0,0,32,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,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,105,0,0,0,315,287,348,348,348,286,317,0,0,0,0,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,14,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,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,41,89,0,0,331,305,348,348,348,304,333,88,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, -33,33,33,33,33,33,33,33,33,33,33,33,33,33,31,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,149,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,149,0,0,0,0,0,0,0,0,119,11,0,0,0,0,41,88,88,347,407,408,409,348,348,349,11,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, -33,33,33,33,33,33,33,33,33,33,33,33,33,31,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,149,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,150,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,363,375,376,377,348,348,365,103,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, +17,17,17,17,17,17,17,17,17,17,17,17,17,14,33,34,0,0,0,87,88,88,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,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,41,89,0,0,331,305,348,348,348,304,333,88,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, +33,33,33,33,33,33,33,33,33,33,33,33,33,33,31,50,0,0,0,103,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,149,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,149,0,0,0,0,0,0,0,0,119,11,0,0,0,0,41,88,88,347,407,408,409,348,348,349,11,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, +33,33,33,33,33,33,33,33,33,33,33,33,33,31,50,0,0,0,0,119,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,149,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,150,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,363,375,376,377,348,348,365,103,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, 33,33,33,33,33,33,33,33,33,33,33,33,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,149,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,150,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,363,391,392,393,364,364,365,103,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, 33,33,33,33,33,33,33,33,33,33,33,33,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,150,0,0,0,0,0,0,0,0,0,0,0,0,0,134,165,181,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,105,0,0,0,0,103,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, -33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,142,143,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,134,165,181,181,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,105,0,0,87,88,26,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, -33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,157,158,159,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,134,165,181,181,181,3,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,41,88,88,26,0,0,9,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, -33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,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,134,164,165,181,181,181,181,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,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, +33,33,33,33,33,33,33,33,33,33,33,33,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,149,0,0,0,0,0,0,0,0,0,0,0,134,165,181,181,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,105,0,0,87,88,26,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, +33,33,33,33,33,33,33,33,33,33,33,33,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,149,0,0,0,0,0,0,0,0,0,0,134,165,181,181,181,3,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,41,88,88,26,0,0,9,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, +33,33,33,33,33,33,33,33,33,33,33,33,33,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,44,45,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,134,164,165,181,181,181,181,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,103,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, 33,33,33,33,33,33,33,33,33,33,33,33,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,149,0,0,0,0,0,0,134,164,165,180,181,181,181,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,0,0,0,0,9,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, 33,33,33,33,33,33,33,33,33,33,33,33,33,34,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,134,165,0,0,0,0,0,134,165,180,181,180,181,181,181,181,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,103,0,0,0,0,0,0,0,0,0,9,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, 33,33,33,33,33,33,33,33,33,33,33,33,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,149,181,0,0,0,0,0,149,181,180,181,180,181,181,181,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,119,11,0,0,0,0,0,0,9,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, @@ -323,7 +324,7 @@ 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,119,11,0,0,0,0,0,9,120,121,148,119,11,0,0,0,0,41,89,147,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,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,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,149,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, @@ -475,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,41,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,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,275,0,0,275,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,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,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,275,0,0,0,275,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,275,0,0,0,0,0,0,0,0,0,0,0, @@ -560,8 +561,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,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,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,776,0,0,0,0,0,0,0,777,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,275,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,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,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,276,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,613,614,615,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,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,796,0,797,0,0,0,0,0,0,0,0,0,0,0,276,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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, @@ -627,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,276,0,0,0,276,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,275,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,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, @@ -779,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 </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, @@ -931,7 +932,7 @@ 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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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, @@ -1083,7 +1084,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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, @@ -1235,7 +1236,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 </data> </layer> - <objectgroup name="Objects"> + <objectgroup id="9" name="Objects" visible="0"> <object id="1" name="To Nivalis" type="warp" x="1184" y="1760" width="32" height="32"> <properties> <property name="dest_map" value="020-1"/> diff --git a/maps/099-7.tmx b/maps/099-7.tmx index ebb85a0c..6f891aa5 100644 --- a/maps/099-7.tmx +++ b/maps/099-7.tmx @@ -1162,7 +1162,7 @@ 1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168 </data> </layer> - <layer id="8" name="Collision" width="140" height="140"> + <layer id="8" name="Collision" width="140" height="140" visible="0"> <data encoding="csv"> 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, @@ -1191,7 +1191,7 @@ 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,0,0,1370,0,0,1370,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,1370,1370,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,0,1370,0,0,0,0,0,0,0,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,0,0,1370,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,0,0,0,0,0,0,1370,1370,0,0,0,0,0,0,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,1370,0,0,0,0,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, -1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,1370,0,0,0,0,1370,0,1370,1370,1370,1370,0,1370,1370,1370,0,0,1370,1370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, +1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,1370,0,0,0,0,1370,0,1370,1370,1370,1370,0,1370,1370,1370,0,1370,1370,1370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,1370,0,0,1370,0,0,0,0,0,1370,1370,0,0,0,0,0,0,0,1370,1370,0,0,0,0,0,1370,0,0,0,0,0,0,0,0,0,0,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,1370,0,0,0,0,0,0,0,0,1370,1370,1370,1370,1370,0,0,0,0,0,0,1370,1370,0,0,1370,0,0,0,0,0,0,0,0,0,1370,0,0,1370,0,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,0,0,0,0,0,0,0,0,0,0,0,0,0,1370,1370,0,0,0,0,0,0,1370,1370,1370,1370,0,0,1370,0,0,0,1370,0,1370,0,0,0,0,0,0,0,0,1370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, |
