summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md18
-rw-r--r--graphics/items/equipment/head/blinkingevil.pngbin0 -> 623 bytes
-rw-r--r--graphics/sprites/equipment/head/blinkingevil.pngbin0 -> 4972 bytes
-rw-r--r--graphics/sprites/equipment/head/blinkingevil.xml291
-rw-r--r--graphics/sprites/equipment/legs/skirt-female.xml4
-rw-r--r--graphics/sprites/equipment/legs/skirt.pngbin15782 -> 52404 bytes
-rw-r--r--graphics/sprites/monsters/skeleton.xml95
-rw-r--r--graphics/tiles/wood_lab_small.pngbin0 -> 4923 bytes
-rw-r--r--items/equip-head/_include.xml5
-rw-r--r--items/equip-head/item2270_BlinkingEvil.xml12
-rw-r--r--items/equip-head/item2271_BlinkingEvilRed.xml12
-rw-r--r--items/equip-head/item2272_BlinkingEvilBlue.xml12
-rw-r--r--items/equip-head/item2273_BlinkingEvilPink.xml12
-rw-r--r--items/equip-head/item2274_BlinkingEvilYellow.xml12
-rw-r--r--license.md1
-rw-r--r--maps/006-3.tmx18
-rw-r--r--maps/009-1.tmx4
-rw-r--r--maps/010-2.tmx72
-rw-r--r--maps/026-2.tmx22
-rw-r--r--npcs/_include.xml1
-rw-r--r--npcs/npc106.xml8
-rw-r--r--npcs/npc108.xml4
-rw-r--r--npcs/npc167.xml6
-rw-r--r--npcs/npc182.xml10
-rw-r--r--npcs/npc201.xml8
-rw-r--r--npcs/npc370.xml10
-rw-r--r--npcs/npc371.xml10
-rw-r--r--npcs/npc376.xml4
-rw-r--r--npcs/npc399.xml4
-rw-r--r--tilesets/wood_lab_small.tsx24
30 files changed, 588 insertions, 91 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..ed5c991f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,18 @@
+# Contributing
+*This repository is* ***feature-frozen****. Anything that adds new content will NOT be merged.*
+
+Only patches for the following will be accepted:
+
+
+## High priority patches
+- Missing sprites for already-released content [(green Error boxes)](https://github.com/themanaworld/tmwa-client-data/blob/master/graphics/sprites/error.png).
+- XML errors.
+
+## Low priority patches
+- Typos.
+- Missing or incorrect item stats.
+- Missing or incorrect translation information in XML files.
+- Mapping errors (tiles on the wrong layer).
+- Quest log modifications.
+- Missing frames in sprites.
+- Misc visual improvements (avatars, icons, ...).
diff --git a/graphics/items/equipment/head/blinkingevil.png b/graphics/items/equipment/head/blinkingevil.png
new file mode 100644
index 00000000..387080ae
--- /dev/null
+++ b/graphics/items/equipment/head/blinkingevil.png
Binary files differ
diff --git a/graphics/sprites/equipment/head/blinkingevil.png b/graphics/sprites/equipment/head/blinkingevil.png
new file mode 100644
index 00000000..76ec7b8f
--- /dev/null
+++ b/graphics/sprites/equipment/head/blinkingevil.png
Binary files differ
diff --git a/graphics/sprites/equipment/head/blinkingevil.xml b/graphics/sprites/equipment/head/blinkingevil.xml
new file mode 100644
index 00000000..4c9b81b1
--- /dev/null
+++ b/graphics/sprites/equipment/head/blinkingevil.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/equipment/head/blinkingevil.png|R" width="21" height="21"/>
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-35" delay="2000"/>
+ <frame index="10" offsetX="-1" offsetY="-34" delay="75"/>
+ <frame index="11" offsetX="-2" offsetY="-34" delay="300"/>
+ <frame index="0" offsetX="-1" offsetY="-35" delay="1500"/>
+ <frame index="11" offsetX="-2" offsetY="-34" delay="300"/>
+ <frame index="0" offsetX="-1" offsetY="-35" delay="500"/>
+ <frame index="11" offsetX="-2" offsetY="-34" delay="350"/>
+ <frame index="0" offsetX="-1" offsetY="-35" delay="1500"/>
+ <frame index="10" offsetX="-1" offsetY="-34" delay="3500"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="-4" offsetY="-37" delay="1750"/>
+ <frame index="13" offsetX="-7" offsetY="-35" delay="100"/>
+ <frame index="14" offsetX="-5" offsetY="-35" delay="300"/>
+ <frame index="1" offsetX="-4" offsetY="-37" delay="1000"/>
+ <frame index="13" offsetX="-7" offsetY="-35" delay="150"/>
+ <frame index="14" offsetX="-5" offsetY="-35" delay="300"/>
+ <frame index="1" offsetX="-4" offsetY="-37" delay="2500"/>
+ <frame index="13" offsetX="-7" offsetY="-35" delay="100"/>
+ <frame index="14" offsetX="-5" offsetY="-35" delay="300"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-1" offsetY="-35"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="2" offsetY="-37" delay="1750"/>
+ <frame index="12" offsetX="1" offsetY="-35" delay="150"/>
+ <frame index="3" offsetX="2" offsetY="-37" delay="300"/>
+ <frame index="12" offsetX="1" offsetY="-35" delay="150"/>
+ <frame index="3" offsetX="2" offsetY="-37" delay="1500"/>
+ <frame index="12" offsetX="1" offsetY="-35" delay="250"/>
+ </animation>
+ </action>
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-35" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-36" delay="150"/>
+ <frame index="0" offsetX="-1" offsetY="-35" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-36" delay="150"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="-4" offsetY="-37" delay="75"/>
+ <frame index="1" offsetX="-4" offsetY="-36" delay="75"/>
+ <frame index="1" offsetX="-4" offsetY="-37" delay="150"/>
+ <frame index="1" offsetX="-4" offsetY="-36" delay="75"/>
+ <frame index="1" offsetX="-4" offsetY="-37" delay="75"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="3" offsetY="-36" delay="75"/>
+ <frame index="2" offsetX="3" offsetY="-37" delay="150"/>
+ <frame index="2" offsetX="3" offsetY="-36" delay="75"/>
+ <frame index="2" offsetX="3" offsetY="-37" delay="150"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="2" offsetY="-37" delay="75"/>
+ <frame index="3" offsetX="2" offsetY="-36" delay="75"/>
+ <frame index="3" offsetX="2" offsetY="-37" delay="150"/>
+ <frame index="3" offsetX="2" offsetY="-36" delay="75"/>
+ <frame index="3" offsetX="2" offsetY="-37" delay="75"/>
+ </animation>
+ </action>
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-34" delay="75"/>
+ <frame index="16" offsetX="-2" offsetY="-32" delay="75"/>
+ <frame index="0" offsetX="-1" offsetY="-32" delay="75"/>
+ <frame index="16" offsetX="-2" offsetY="-30" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="0" offsetY="-37" delay="75"/>
+ <frame index="1" offsetX="0" offsetY="-38" delay="75"/>
+ <frame index="18" offsetX="-8" offsetY="-33" delay="75"/>
+ <frame index="18" offsetX="-9" offsetY="-32" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-2" offsetY="-25" delay="75"/>
+ <frame index="2" offsetX="-2" offsetY="-23" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-1" offsetY="-37" delay="75"/>
+ <frame index="3" offsetX="-1" offsetY="-38" delay="75"/>
+ <frame index="17" offsetX="0" offsetY="-33" delay="75"/>
+ <frame index="17" offsetX="0" offsetY="-32" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-34" delay="225"/>
+ <frame index="16" offsetX="-2" offsetY="-31" delay="75"/>
+ <frame index="16" offsetX="-2" offsetY="-32" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="-1" offsetY="-36" delay="225"/>
+ <frame index="18" offsetX="-3" offsetY="-35" delay="75"/>
+ <frame index="18" offsetX="-3" offsetY="-35" delay="75"/>
+ <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="-1" offsetY="-36" delay="225"/>
+ <frame index="17" offsetX="-5" offsetY="-35" delay="75"/>
+ <frame index="17" offsetX="-5" offsetY="-35" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-23" delay="750"/>
+ <frame index="11" offsetX="-2" offsetY="-22" delay="250"/>
+ <frame index="0" offsetX="-1" offsetY="-23" delay="1500"/>
+ <frame index="11" offsetX="-2" offsetY="-22" delay="250"/>
+ <frame index="0" offsetX="-1" offsetY="-23" delay="2500"/>
+ <frame index="10" offsetX="-1" offsetY="-22" delay="300"/>
+ <frame index="11" offsetX="-2" offsetY="-22" delay="300"/>
+ <frame index="15" offsetX="-1" offsetY="-21" delay="3000"/>
+ <frame index="11" offsetX="-2" offsetY="-22" delay="300"/>
+ <frame index="0" offsetX="-1" offsetY="-23" delay="1000"/>
+ <frame index="10" offsetX="-1" offsetY="-22" delay="400"/>
+ <frame index="11" offsetX="-2" offsetY="-22" delay="1500"/>
+ <frame index="10" offsetX="-1" offsetY="-22" delay="400"/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="0" offsetY="-27" delay="1500"/>
+ <frame index="14" offsetX="-1" offsetY="-25" delay="300"/>
+ <frame index="1" offsetX="0" offsetY="-27" delay="250"/>
+ <frame index="13" offsetX="-3" offsetY="-25" delay="250"/>
+ <frame index="1" offsetX="0" offsetY="-27" delay="1500"/>
+ <frame index="13" offsetX="-3" offsetY="-25" delay="250"/>
+ <frame index="14" offsetX="-1" offsetY="-25" delay="2500"/>
+ <frame index="13" offsetX="-3" offsetY="-25" delay="200"/>
+ </animation>
+ <animation direction="up">
+ <frame index="2"/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-3" offsetY="-27" delay="1500"/>
+ <frame index="12" offsetX="-4" offsetY="-25" delay="100"/>
+ <frame index="3" offsetX="-3" offsetY="-27" delay="600"/>
+ <frame index="12" offsetX="-4" offsetY="-25" delay="350"/>
+ <frame index="3" offsetX="-3" offsetY="-27" delay="450"/>
+ <frame index="12" offsetX="-4" offsetY="-25" delay="1500"/>
+ </animation>
+ </action>
+ <action name="dead" imageset="base">
+ <animation direction="default">
+ <frame index="4" offsetX="17" offsetY="-13" delay="200"/>
+ <frame index="5" offsetX="17" offsetY="-13" delay="200"/>
+ <frame index="6" offsetX="17" offsetY="-13" delay="200"/>
+ <frame index="7" offsetX="17" offsetY="-13" delay="200"/>
+ <frame index="8" offsetX="17" offsetY="-13" delay="200"/>
+ <frame index="6" offsetX="17" offsetY="-13" delay="250"/>
+ <frame index="5" offsetX="17" offsetY="-13" delay="250"/>
+ <frame index="8" offsetX="17" offsetY="-13" delay="300"/>
+ <frame index="7" offsetX="17" offsetY="-13" delay="250"/>
+ <frame index="8" offsetX="17" offsetY="-13" delay="250"/>
+ <frame index="9" offsetX="17" offsetY="-13" delay="4000"/>
+ <frame index="8" offsetX="17" offsetY="-13" delay="400"/>
+ <frame index="7" offsetX="17" offsetY="-13" delay="350"/>
+ <frame index="6" offsetX="17" offsetY="-13" delay="300"/>
+ <frame index="5" offsetX="17" offsetY="-13" delay="300"/>
+ <frame index="4" offsetX="17" offsetY="-13" delay="2500"/>
+ </animation>
+ </action>
+ <action name="attack_2hand" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-34" delay="140"/>
+ <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+ <frame index="16" offsetX="-2" offsetY="-35" delay="140"/>
+ <frame index="16" offsetX="-2" offsetY="-29" delay="140"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="-4" offsetY="-35" delay="140"/>
+ <frame index="1" offsetX="-1" offsetY="-37" delay="140"/>
+ <frame index="18" offsetX="-3" offsetY="-36" delay="140"/>
+ <frame index="18" offsetX="-10" offsetY="-31" delay="140"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+ <frame index="2" offsetX="-3" offsetY="-36" delay="140"/>
+ <frame index="2" offsetX="-2" offsetY="-39" delay="140"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="4" offsetY="-35" delay="140"/>
+ <frame index="3" offsetX="1" offsetY="-37" delay="140"/>
+ <frame index="17" offsetX="-3" offsetY="-37" delay="140"/>
+ <frame index="17" offsetX="2" offsetY="-32" delay="140"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_sword_stab" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-36" delay="100"/>
+ <frame index="16" offsetX="-1" offsetY="-37" delay="100"/>
+ <frame index="0" offsetX="-1" offsetY="-34" delay="100"/>
+ <frame index="16" offsetX="-1" offsetY="-33" delay="100"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="2" offsetY="-39" delay="100"/>
+ <frame index="18" offsetX="2" offsetY="-40" delay="100"/>
+ <frame index="1" offsetX="-2" offsetY="-37" delay="100"/>
+ <frame index="18" offsetX="-3" offsetY="-36" delay="100"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-3" offsetY="-38" delay="300"/>
+ <frame index="2" offsetX="-3" offsetY="-36" delay="100"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-2" offsetY="-39" delay="100"/>
+ <frame index="17" offsetX="-2" offsetY="-40" delay="100"/>
+ <frame index="3" offsetX="1" offsetY="-37" delay="100"/>
+ <frame index="17" offsetX="2" offsetY="-36" delay="100"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_spear" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-2" offsetY="-39" delay="280"/>
+ <frame index="16" offsetX="-2" offsetY="-40" delay="140"/>
+ <frame index="16" offsetX="-2" offsetY="-33" delay="140"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="3" offsetY="-39" delay="140"/>
+ <frame index="18" offsetX="4" offsetY="-40" delay="140"/>
+ <frame index="1" offsetX="-1" offsetY="-41" delay="140"/>
+ <frame index="18" offsetX="-3" offsetY="-36" delay="140"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-3" offsetY="-38" delay="420"/>
+ <frame index="2" offsetX="-4" offsetY="-41" delay="140"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-2" offsetY="-39" delay="140"/>
+ <frame index="17" offsetX="-3" offsetY="-40" delay="140"/>
+ <frame index="3" offsetX="2" offsetY="-41" delay="140"/>
+ <frame index="17" offsetX="4" offsetY="-36" delay="140"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_chop" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
+ <frame index="16" offsetX="-2" offsetY="-37" delay="140"/>
+ <frame index="0" offsetX="-1" offsetY="-39" delay="140"/>
+ <frame index="16" offsetX="-1" offsetY="-34" delay="140"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <frame index="1" offsetX="2" offsetY="-41" delay="140"/>
+ <frame index="18" offsetX="2" offsetY="-40" delay="140"/>
+ <frame index="1" offsetX="2" offsetY="-41" delay="140"/>
+ <frame index="18" offsetX="-3" offsetY="-37" delay="140"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <frame index="2" offsetX="-3" offsetY="-38" delay="280"/>
+ <frame index="2" offsetX="-3" offsetY="-36" delay="280"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <frame index="3" offsetX="-1" offsetY="-41" delay="140"/>
+ <frame index="17" offsetX="-1" offsetY="-40" delay="140"/>
+ <frame index="3" offsetX="0" offsetY="-41" delay="140"/>
+ <frame index="17" offsetX="4" offsetY="-37" delay="140"/>
+ <end/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/equipment/legs/skirt-female.xml b/graphics/sprites/equipment/legs/skirt-female.xml
index 3f605212..c4d1a9d0 100644
--- a/graphics/sprites/equipment/legs/skirt-female.xml
+++ b/graphics/sprites/equipment/legs/skirt-female.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<sprite variants="135" variant_offset="1">
- <imageset name="base" src="graphics/sprites/equipment/legs/skirt-male.png|W" width="64" height="64"/>
- <include file="model/male.xml"/>
+ <imageset name="base" src="graphics/sprites/equipment/legs/skirt-female.png|W" width="64" height="64"/>
+ <include file="model/female.xml"/>
</sprite>
diff --git a/graphics/sprites/equipment/legs/skirt.png b/graphics/sprites/equipment/legs/skirt.png
index a5451f5e..c3408399 100644
--- a/graphics/sprites/equipment/legs/skirt.png
+++ b/graphics/sprites/equipment/legs/skirt.png
Binary files differ
diff --git a/graphics/sprites/monsters/skeleton.xml b/graphics/sprites/monsters/skeleton.xml
index 7f76b5c2..46ec397a 100644
--- a/graphics/sprites/monsters/skeleton.xml
+++ b/graphics/sprites/monsters/skeleton.xml
@@ -1,5 +1,96 @@
<?xml version="1.0"?>
-<sprite variants="72" variant_offset="1">
+<sprite>
<imageset name="base" src="graphics/sprites/monsters/skeleton.png|W" width="64" height="64"/>
- <include file="model/base.xml"/>
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0"/>
+ </animation>
+ <animation direction="left">
+ <frame index="18"/>
+ </animation>
+ <animation direction="up">
+ <frame index="36"/>
+ </animation>
+ <animation direction="right">
+ <frame index="54"/>
+ </animation>
+ </action>
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <sequence start="1" end="6" delay="75"/>
+ </animation>
+ <animation direction="left">
+ <sequence start="19" end="24" delay="75"/>
+ </animation>
+ <animation direction="up">
+ <sequence start="37" end="42" delay="75"/>
+ </animation>
+ <animation direction="right">
+ <sequence start="55" end="60" delay="75"/>
+ </animation>
+ </action>
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="7"/>
+ </animation>
+ <animation direction="left">
+ <frame index="25"/>
+ </animation>
+ <animation direction="up">
+ <frame index="43"/>
+ </animation>
+ <animation direction="right">
+ <frame index="61"/>
+ </animation>
+ </action>
+ <action name="dead" imageset="base">
+ <animation direction="down">
+ <frame index="8"/>
+ </animation>
+ <animation direction="left">
+ <frame index="26"/>
+ </animation>
+ <animation direction="up">
+ <frame index="44"/>
+ </animation>
+ <animation direction="right">
+ <frame index="62"/>
+ </animation>
+ </action>
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <sequence start="9" end="12" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <sequence start="27" end="30" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <sequence start="45" end="48" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <sequence start="63" end="66" delay="75"/>
+ <end/>
+ </animation>
+ </action>
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <sequence start="13" end="17" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="left">
+ <sequence start="31" end="35" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="up">
+ <sequence start="49" end="53" delay="75"/>
+ <end/>
+ </animation>
+ <animation direction="right">
+ <sequence start="67" end="71" delay="75"/>
+ <end/>
+ </animation>
+ </action>
</sprite>
diff --git a/graphics/tiles/wood_lab_small.png b/graphics/tiles/wood_lab_small.png
new file mode 100644
index 00000000..be763bf3
--- /dev/null
+++ b/graphics/tiles/wood_lab_small.png
Binary files differ
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index eb108f3b..ddc50d12 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -173,6 +173,11 @@
<include name="items/equip-head/item2267_OrangeBeret.xml"/>
<include name="items/equip-head/item2268_PurpleBeret.xml"/>
<include name="items/equip-head/item2269_DarkGreenBeret.xml"/>
+ <include name="items/equip-head/item2270_BlinkingEvil.xml"/>
+ <include name="items/equip-head/item2271_BlinkingEvilRed.xml"/>
+ <include name="items/equip-head/item2272_BlinkingEvilBlue.xml"/>
+ <include name="items/equip-head/item2273_BlinkingEvilPink.xml"/>
+ <include name="items/equip-head/item2274_BlinkingEvilYellow.xml"/>
<include name="items/equip-head/item4020_CandleHelmet.xml"/>
<include name="items/equip-head/item4027_YetiMask.xml"/>
<include name="items/equip-head/item4028_WizardHat.xml"/>
diff --git a/items/equip-head/item2270_BlinkingEvil.xml b/items/equip-head/item2270_BlinkingEvil.xml
new file mode 100644
index 00000000..3cd99b77
--- /dev/null
+++ b/items/equip-head/item2270_BlinkingEvil.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+ <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+ <its:translateRule selector="//item/@name" translate="yes"/>
+ <its:translateRule selector="//item/@description" translate="yes"/>
+ <its:translateRule selector="//item/@effect" translate="yes"/>
+ <its:translateRule selector="//*" translate="no"/>
+ </its:rules>
+ <item id="2270" image="equipment/head/blinkingevil.png|W:#009900,00bf00,00d900,00ff00" name="Mask of Blinking Evil (Green)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+ <sprite gender="unisex">equipment/head/blinkingevil.xml|#009900,00bf00,00d900,00ff00</sprite>
+ </item>
+</items>
diff --git a/items/equip-head/item2271_BlinkingEvilRed.xml b/items/equip-head/item2271_BlinkingEvilRed.xml
new file mode 100644
index 00000000..add5e296
--- /dev/null
+++ b/items/equip-head/item2271_BlinkingEvilRed.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+ <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+ <its:translateRule selector="//item/@name" translate="yes"/>
+ <its:translateRule selector="//item/@description" translate="yes"/>
+ <its:translateRule selector="//item/@effect" translate="yes"/>
+ <its:translateRule selector="//*" translate="no"/>
+ </its:rules>
+ <item id="2271" image="equipment/head/blinkingevil.png|W:#d90000,ff0000" name="Mask of Blinking Evil (Red)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+ <sprite gender="unisex">equipment/head/blinkingevil.xml</sprite>
+ </item>
+</items>
diff --git a/items/equip-head/item2272_BlinkingEvilBlue.xml b/items/equip-head/item2272_BlinkingEvilBlue.xml
new file mode 100644
index 00000000..3df7e241
--- /dev/null
+++ b/items/equip-head/item2272_BlinkingEvilBlue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+ <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+ <its:translateRule selector="//item/@name" translate="yes"/>
+ <its:translateRule selector="//item/@description" translate="yes"/>
+ <its:translateRule selector="//item/@effect" translate="yes"/>
+ <its:translateRule selector="//*" translate="no"/>
+ </its:rules>
+ <item id="2272" image="equipment/head/blinkingevil.png|W:#002d99,0038be,0040da,004bff" name="Mask of Blinking Evil (Blue)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+ <sprite gender="unisex">equipment/head/blinkingevil.xml|#002d99,0038be,0040da,004bff</sprite>
+ </item>
+</items>
diff --git a/items/equip-head/item2273_BlinkingEvilPink.xml b/items/equip-head/item2273_BlinkingEvilPink.xml
new file mode 100644
index 00000000..ab6cbe35
--- /dev/null
+++ b/items/equip-head/item2273_BlinkingEvilPink.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+ <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+ <its:translateRule selector="//item/@name" translate="yes"/>
+ <its:translateRule selector="//item/@description" translate="yes"/>
+ <its:translateRule selector="//item/@effect" translate="yes"/>
+ <its:translateRule selector="//*" translate="no"/>
+ </its:rules>
+ <item id="2273" image="equipment/head/blinkingevil.png|W:#bf2296,f245a7,ff6ea8,ff99bd" name="Mask of Blinking Evil (Pink)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+ <sprite gender="unisex">equipment/head/blinkingevil.xml|#bf2296,f245a7,ff6ea8,ff99bd</sprite>
+ </item>
+</items>
diff --git a/items/equip-head/item2274_BlinkingEvilYellow.xml b/items/equip-head/item2274_BlinkingEvilYellow.xml
new file mode 100644
index 00000000..0873dde2
--- /dev/null
+++ b/items/equip-head/item2274_BlinkingEvilYellow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+ <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+ <its:translateRule selector="//item/@name" translate="yes"/>
+ <its:translateRule selector="//item/@description" translate="yes"/>
+ <its:translateRule selector="//item/@effect" translate="yes"/>
+ <its:translateRule selector="//*" translate="no"/>
+ </its:rules>
+ <item id="2274" image="equipment/head/blinkingevil.png|W:#b4b427,d2bb27,ffff00,f3ff32" name="Mask of Blinking Evil (Yellow)" description="Made of a strange, animated stone, this mask seems to cling to your face" effect="M. Attack +10/ M. defense +5" type="equip-head" defense="13" weight="50">
+ <sprite gender="unisex">equipment/head/blinkingevil.xml|#b4b427,d2bb27,ffff00,f3ff32</sprite>
+ </item>
+</items>
diff --git a/license.md b/license.md
index 710a168f..aa93ac67 100644
--- a/license.md
+++ b/license.md
@@ -1123,6 +1123,7 @@ File | Artists | Licenses
`graphics/tiles/witch_sisters_picture_x3.png` | :grey_question: | GPLv2
`graphics/tiles/woodenpump.png` | Varuna | GPLv2, CC BY-SA 3.0
`graphics/tiles/wood_lab.png` | Fate, Varuna, Enchilado, Wushin | GPLv2
+`graphics/tiles/wood_lab_small.png` | Fate, Varuna, Enchilado, Wushin | GPLv2
`graphics/tiles/woodland_graveyard_crypt.png` | :grey_question:, Spit23 | GPLv2
`graphics/tiles/woodland_graveyard_ground.png` | :grey_question:, Crush | GPLv2
`graphics/tiles/woodland_graveyard_x3.png` | :grey_question:, Black Don, Crush | GPLv2
diff --git a/maps/006-3.tmx b/maps/006-3.tmx
index 58d68a11..9d44e1cd 100644
--- a/maps/006-3.tmx
+++ b/maps/006-3.tmx
@@ -110,13 +110,13 @@
23,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,54,59,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,68,52,36,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,41,42,39,37,55,58,53,71,69,7,7,7,7,7,7,7,7,7,7,7,6,23,41,39,37,53,72,7,7,7,7,109,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,8,7,7,7,7,7,7,7,70,75,43,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,68,52,36,43,23,23,23,23,23,23,23,23,23,23,23,23,41,39,42,39,42,42,39,42,39,42,39,42,37,55,55,53,71,74,69,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,57,55,53,72,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,24,7,7,7,7,7,7,7,7,54,59,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,126,7,7,7,7,68,52,59,23,23,23,23,23,23,23,23,23,23,41,39,37,58,55,55,55,55,58,55,58,55,55,55,53,71,71,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,41,73,71,72,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,7,70,75,23,23,23,23,23,23,23,23,41,42,39,42,42,39,43,23,8,7,7,7,7,7,7,7,7,7,7,7,68,38,43,23,23,23,23,23,23,23,23,41,37,55,53,74,71,71,71,71,74,71,74,71,71,71,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,41,39,37,56,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,41,40,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,41,37,55,55,58,55,55,36,42,42,39,43,23,23,8,7,7,7,7,7,7,7,54,59,23,23,23,23,23,23,23,23,57,53,71,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,7,7,6,23,41,37,55,53,72,7,7,7,7,7,7,7,123,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
-23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,56,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,41,37,53,71,71,74,71,71,52,55,55,55,36,39,42,40,7,7,7,7,7,7,7,68,75,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,7,7,7,7,7,7,7,7,7,7,7,7,6,41,42,39,37,53,71,72,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,73,72,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,57,53,69,7,7,7,7,7,68,71,71,71,52,55,55,56,7,7,7,7,7,7,7,7,38,43,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,126,7,7,7,7,7,7,7,6,21,42,37,55,55,53,72,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,41,40,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,73,69,7,7,7,7,7,7,7,7,7,7,68,71,71,72,7,7,7,7,7,7,7,7,54,59,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,123,7,7,7,7,7,7,7,7,7,7,7,7,6,21,39,39,42,37,55,53,71,71,72,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,57,56,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,7,68,75,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,21,39,37,55,58,55,53,71,69,7,7,7,7,7,7,7,126,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,73,72,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,6,8,7,7,7,7,7,7,7,7,6,41,42,42,37,55,53,71,74,71,69,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,8,7,7,7,7,7,7,7,70,75,23,23,23,23,23,23,23,23,41,42,39,42,42,39,43,23,8,7,7,7,7,7,7,7,7,7,7,7,68,75,23,23,23,23,23,23,23,23,23,41,37,55,53,74,71,71,71,71,74,71,74,71,71,71,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,41,39,37,56,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,41,40,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,41,37,55,55,58,55,55,36,42,42,39,43,23,23,8,7,7,7,7,7,7,7,38,43,23,23,23,23,23,23,23,23,57,53,71,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,7,7,6,23,41,37,55,53,72,7,7,7,7,7,7,7,123,7,7,7,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,57,56,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,41,37,53,71,71,74,71,71,52,55,55,55,36,39,42,40,7,7,7,7,7,7,7,54,59,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,7,7,7,7,7,7,7,7,7,7,7,7,6,41,42,39,37,53,71,72,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,73,72,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,57,53,69,7,7,7,7,7,68,71,71,71,52,55,55,56,7,7,7,7,7,7,7,70,75,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,126,7,7,7,7,7,7,7,6,21,42,37,55,55,53,72,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,41,40,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,73,69,7,7,7,7,7,7,7,7,7,7,68,71,71,72,7,7,7,7,7,7,7,7,38,20,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,123,7,7,7,7,7,7,7,7,7,7,7,7,6,21,39,39,42,37,55,53,71,71,72,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,57,56,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,123,7,7,7,7,7,54,59,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,21,39,37,55,58,55,53,71,69,7,7,7,7,7,7,7,126,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,73,72,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,68,75,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,6,8,7,7,7,7,7,7,7,7,6,41,42,42,37,55,53,71,74,71,69,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,41,40,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,24,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,38,42,39,42,43,23,23,41,42,42,42,37,58,55,53,71,69,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,57,56,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,24,7,7,7,7,7,7,6,8,7,7,7,7,7,7,7,7,7,7,121,7,7,7,7,6,23,23,23,23,23,23,23,23,24,7,7,7,7,7,7,7,54,55,58,55,36,39,42,37,58,55,55,53,74,71,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,41,42,42,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,73,72,7,7,7,7,7,7,7,7,7,22,23,23,23,23,23,23,23,24,7,7,7,7,7,7,38,42,42,42,42,20,8,7,7,7,7,7,7,7,7,7,6,23,23,23,23,23,23,23,23,23,23,8,7,7,7,7,7,7,70,71,74,71,52,55,55,53,74,71,71,69,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,6,23,41,42,39,42,39,42,37,55,55,36,43,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
@@ -729,10 +729,10 @@
2,2,2,2,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,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,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,0,0,0,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,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,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,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,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,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,0,0,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,2,2,2,2,2,2,2,
-2,2,2,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,2,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,0,0,0,0,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,0,0,0,2,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,0,0,0,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,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,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,0,0,0,2,0,0,0,0,0,2,2,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,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,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,0,0,0,0,0,0,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,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,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/009-1.tmx b/maps/009-1.tmx
index 9d89dd2e..52703332 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -290,7 +290,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,649,617,0,0,0,0,0,617,626,0,626,618,0,0,0,0,0,618,627,621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,607,611,0,0,0,617,664,619,0,663,619,621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,607,627,653,0,665,666,621,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,607,622,662,668,621,0,0,0,0,0,0,0,595,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,607,624,651,613,655,617,621,0,0,593,607,626,627,626,626,626,621,0,0,0,0,0,0,0,0,0,0,0,607,610,657,616,0,667,633,621,0,0,0,0,0,0,0,0,589,0,0,0,0,0,0,588,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,607,624,651,613,655,617,621,0,0,593,607,626,627,626,626,626,621,0,0,262,0,0,0,0,0,0,0,0,607,610,657,616,0,667,633,621,0,0,0,0,0,0,0,0,589,0,0,0,0,0,0,588,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,
@@ -606,7 +606,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,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,2,2,2,2,2,2,0,0,0,2,2,2,0,2,2,0,2,2,0,0,0,0,2,2,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,0,0,0,0,0,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,0,0,0,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,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,0,0,0,0,0,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,0,2,2,0,0,0,2,2,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,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,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,2,2,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,2,2,2,0,2,0,2,0,2,0,2,0,0,0,0,2,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,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,2,0,0,2,0,0,0,0,0,2,2,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,2,2,2,0,2,0,2,0,2,0,2,0,0,0,0,2,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,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
diff --git a/maps/010-2.tmx b/maps/010-2.tmx
index a3d7ed6c..94662779 100644
--- a/maps/010-2.tmx
+++ b/maps/010-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="107" height="110" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="107" height="110" tilewidth="32" tileheight="32" nextobjectid="9">
<properties>
<property name="music" value="clouds-calling.ogg"/>
<property name="name" value="Dimond's Cove"/>
@@ -8,7 +8,7 @@
<tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/>
<tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/>
<tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/>
- <tileset firstgid="339" source="../tilesets/woodland_village.tsx"/>
+ <tileset firstgid="355" source="../tilesets/woodland_village.tsx"/>
<layer name="Ground1" width="107" height="110">
<data encoding="csv">
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
@@ -76,16 +76,16 @@
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
-51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,3,5,3,5,3,5,3,5,3,5,3,5,51,5,3,5,3,5,3,5,3,5,3,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
-51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,21,19,21,19,21,19,21,19,21,19,21,51,21,19,21,19,21,19,21,19,21,19,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
-51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,568,568,568,568,568,568,568,568,568,568,568,568,568,568,568,568,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,35,35,35,35,35,35,35,35,35,51,35,35,35,35,35,35,35,35,35,35,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
+51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,3,5,3,5,3,5,3,5,3,5,3,5,51,5,3,5,3,5,3,5,3,5,3,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
+51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,583,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,21,19,21,19,21,19,21,19,21,19,21,51,21,19,21,19,21,19,21,19,21,19,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
+51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,584,584,584,584,584,584,584,584,584,584,584,584,584,584,584,584,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,35,35,35,35,35,35,35,35,35,51,35,35,35,35,35,35,35,35,35,35,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,37,36,37,36,37,36,37,36,37,36,37,51,37,36,37,36,37,36,37,36,37,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,70,71,71,72,51,70,71,71,71,71,71,71,71,71,72,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,86,87,87,88,51,86,87,87,87,87,87,87,87,87,88,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,3,3,3,3,3,3,3,51,86,87,87,88,51,86,87,87,87,87,87,87,87,87,88,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
-51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,567,567,567,567,567,567,567,567,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,19,19,19,19,19,19,51,86,87,87,88,51,86,87,87,87,87,87,87,87,87,88,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
-51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,567,567,567,549,567,567,567,567,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,35,35,35,35,51,86,87,87,88,51,51,51,51,51,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
-51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,567,567,567,565,567,567,567,567,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,86,87,87,88,3,3,3,3,3,36,3,3,3,3,3,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
+51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,583,583,583,583,583,583,583,583,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,19,19,19,19,19,19,51,86,87,87,88,51,86,87,87,87,87,87,87,87,87,88,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
+51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,583,583,583,565,583,583,583,583,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,35,35,35,35,51,86,87,87,88,51,51,51,51,51,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
+51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,583,583,583,581,583,583,583,583,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,86,87,87,88,3,3,3,3,3,36,3,3,3,3,3,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,3,3,3,3,3,3,3,3,86,87,87,88,19,19,19,19,19,36,19,19,19,19,19,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,19,19,19,19,19,19,19,19,86,87,87,88,35,35,35,35,35,36,35,35,35,35,35,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,35,35,35,35,35,35,35,35,102,103,103,104,36,36,36,36,36,36,36,36,36,36,36,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
@@ -305,29 +305,29 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,11,9,8,9,11,8,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,8,11,11,8,9,11,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,210,0,214,0,0,206,207,0,0,206,207,0,0,208,207,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,8,11,11,8,9,11,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,210,0,214,0,0,206,207,0,0,206,207,0,0,208,209,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,226,0,242,0,242,0,226,0,200,0,0,222,223,0,0,222,223,0,0,224,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,258,259,260,83,83,309,310,310,312,309,312,310,309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,0,238,239,0,0,238,239,0,0,240,241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,231,0,254,255,0,0,254,255,0,0,256,257,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,0,0,0,0,0,0,0,0,0,0,0,0,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,246,247,0,0,0,0,0,0,0,0,0,0,145,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,0,491,491,0,0,0,0,0,0,0,0,0,0,534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,32,33,33,33,34,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,177,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,490,0,475,491,0,0,0,0,0,0,0,0,0,0,566,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,32,33,33,33,34,29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,193,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,0,0,0,0,475,491,0,0,0,0,0,0,566,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,226,32,33,33,33,34,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,0,0,0,0,0,0,0,0,0,0,0,0,0,566,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,11,0,0,0,11,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,15,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,490,0,0,0,0,0,490,0,0,475,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,31,0,0,0,0,0,0,0,0,0,226,0,0,308,0,0,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,490,490,0,0,0,0,0,0,475,490,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,475,0,0,318,319,0,0,0,475,490,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,0,0,0,0,0,0,0,0,0,0,0,0,0,534,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,246,247,0,0,0,0,0,0,0,0,0,0,145,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,0,507,507,0,0,0,0,0,0,0,0,0,0,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,32,33,33,33,34,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,177,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,506,0,491,507,0,0,0,0,0,0,0,0,0,0,582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,32,33,33,33,34,29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,193,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,0,0,0,0,0,491,507,0,0,0,0,0,0,582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,226,32,33,33,33,34,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,0,0,0,0,0,0,0,0,0,0,0,0,0,582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,11,0,0,0,11,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,15,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,210,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,506,0,0,0,0,0,506,0,0,491,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,31,0,0,0,0,0,0,0,0,0,226,0,0,308,0,0,226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,506,506,0,0,0,0,0,0,491,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,491,0,0,318,319,0,0,0,491,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,0,0,0,0,0,0,0,0,0,0,0,313,314,259,260,268,308,263,272,269,320,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,14,15,0,0,0,0,0,0,0,11,0,0,14,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,590,0,0,0,0,560,559,561,0,0,0,0,0,0,0,0,0,0,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,204,205,0,12,0,30,31,0,0,0,0,203,204,205,0,12,0,30,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,590,590,0,0,0,0,575,0,0,0,0,0,0,0,0,0,0,0,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,220,221,226,0,308,0,0,311,313,314,0,219,220,221,226,0,308,0,0,311,313,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,590,590,590,0,0,0,558,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,236,237,0,0,0,0,0,0,0,0,0,235,236,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,590,590,590,0,0,0,0,575,0,0,83,0,0,0,195,150,151,152,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,252,253,0,0,0,0,0,149,0,0,0,251,252,253,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,590,590,0,0,590,0,558,0,83,83,0,0,0,0,166,167,168,0,0,0,222,223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,151,197,0,0,0,0,0,0,0,0,0,195,151,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,590,590,590,0,0,0,575,83,83,83,0,0,0,0,0,0,0,0,0,0,238,239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,167,0,0,0,0,0,0,0,0,0,0,0,167,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,590,590,0,590,0,0,590,574,83,83,83,0,0,0,0,0,295,0,0,0,0,254,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,0,0,0,0,0,0,0,0,0,0,0,313,314,259,260,268,308,263,272,269,320,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,14,15,0,0,0,0,0,0,0,11,0,0,14,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,606,0,0,0,0,576,575,577,0,0,0,0,0,0,0,0,0,0,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,204,205,0,12,0,30,31,0,0,0,0,203,204,205,0,12,0,30,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,606,606,0,0,0,0,591,0,0,0,0,0,0,0,0,0,0,0,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,220,221,226,0,308,0,0,311,313,314,0,219,220,221,226,0,308,0,0,311,313,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,606,606,606,0,0,0,574,0,0,0,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,236,237,0,0,0,0,0,0,0,0,0,235,236,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,606,606,606,0,0,0,0,591,0,0,83,0,0,0,195,150,151,152,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,252,253,0,0,0,0,0,149,0,0,0,251,252,253,0,0,0,0,0,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,606,606,0,0,606,0,574,0,83,83,0,0,0,0,166,167,168,0,0,0,222,223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,151,197,0,0,0,0,0,0,0,0,0,195,151,149,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,606,606,606,0,0,0,591,83,83,83,0,0,0,0,0,0,0,0,0,0,238,239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,167,0,0,0,0,0,0,0,0,0,0,0,167,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,606,606,0,606,0,0,606,590,83,83,83,0,0,0,0,0,295,0,0,0,0,254,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,295,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -579,7 +579,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
- <layer name="Collision" width="107" height="110" visible="0">
+ <layer name="Collision" width="107" height="110">
<data encoding="csv">
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -693,56 +693,56 @@
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
</data>
</layer>
- <objectgroup name="Objects" width="0" height="0">
- <object name="To Cellar" type="warp" x="864" y="768" width="32" height="32">
+ <objectgroup name="Objects">
+ <object id="1" name="To Cellar" type="warp" x="864" y="768" width="32" height="32">
<properties>
<property name="dest_map" value="010-2"/>
<property name="dest_tile_x" value="35"/>
<property name="dest_tile_y" value="68"/>
</properties>
</object>
- <object name="To Outside" type="warp" x="1024" y="1440" width="32" height="32">
+ <object id="2" name="To Outside" type="warp" x="1024" y="1440" width="32" height="32">
<properties>
<property name="dest_map" value="010-1"/>
<property name="dest_tile_x" value="36"/>
<property name="dest_tile_y" value="95"/>
</properties>
</object>
- <object name="To Second Floor" type="warp" x="1248" y="864" width="96" height="32">
+ <object id="3" name="To Second Floor" type="warp" x="1248" y="864" width="96" height="32">
<properties>
<property name="dest_map" value="010-2"/>
<property name="dest_tile_x" value="83"/>
<property name="dest_tile_y" value="28"/>
</properties>
</object>
- <object name="To First Floor" type="warp" x="1152" y="2176" width="32" height="32">
+ <object id="4" name="To First Floor" type="warp" x="1152" y="2176" width="32" height="32">
<properties>
<property name="dest_map" value="010-2"/>
<property name="dest_tile_x" value="28"/>
<property name="dest_tile_y" value="24"/>
</properties>
</object>
- <object name="To Third Floor" type="warp" x="2112" y="864" width="96" height="32">
+ <object id="5" name="To Third Floor" type="warp" x="2112" y="864" width="96" height="32">
<properties>
<property name="dest_map" value="010-2"/>
<property name="dest_tile_x" value="67"/>
<property name="dest_tile_y" value="72"/>
</properties>
</object>
- <object name="To First Floor" type="warp" x="2624" y="928" width="96" height="32">
+ <object id="6" name="To First Floor" type="warp" x="2624" y="928" width="96" height="32">
<properties>
<property name="dest_map" value="010-2"/>
<property name="dest_tile_x" value="40"/>
<property name="dest_tile_y" value="28"/>
</properties>
</object>
- <object name="To Second Floor" type="warp" x="2112" y="2336" width="96" height="32">
+ <object id="7" name="To Second Floor" type="warp" x="2112" y="2336" width="96" height="32">
<properties>
<property name="dest_map" value="010-2"/>
<property name="dest_tile_x" value="67"/>
<property name="dest_tile_y" value="28"/>
</properties>
</object>
- <object name="dimonds-cove.ogg" type="MUSIC" x="1152" y="992" width="256" height="352"/>
+ <object id="8" name="dimonds-cove.ogg" type="MUSIC" x="1152" y="992" width="256" height="352"/>
</objectgroup>
</map>
diff --git a/maps/026-2.tmx b/maps/026-2.tmx
index 5fd2853a..5b99d3d4 100644
--- a/maps/026-2.tmx
+++ b/maps/026-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="106" height="157" tilewidth="32" tileheight="32" nextobjectid="36">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="106" height="157" tilewidth="32" tileheight="32" nextobjectid="37">
<properties>
<property name="music" value="inquisitive-inn.ogg"/>
<property name="name" value="Swamp Indoors"/>
@@ -8,6 +8,7 @@
<tileset firstgid="3" source="../tilesets/woodland_indoor.tsx"/>
<tileset firstgid="259" source="../tilesets/woodland_indoor_x2.tsx"/>
<tileset firstgid="307" source="../tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="355" source="../tilesets/wood_lab_small.tsx"/>
<layer name="Ground1" width="106" height="157">
<data encoding="csv">
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
@@ -201,8 +202,8 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,150,151,152,197,0,195,150,151,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,195,166,167,168,197,0,195,166,167,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,17,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,19,19,19,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,0,0,0,0,0,0,0,0,0,0,32,33,33,34,0,0,0,0,0,0,0,0,195,150,151,152,197,0,195,150,151,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,35,35,35,313,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,17,17,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,19,19,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,0,0,0,0,0,0,0,0,0,0,32,33,33,34,0,0,0,0,0,0,0,0,195,150,151,152,197,0,195,150,151,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,35,35,35,35,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,33,33,34,0,0,0,0,0,0,0,0,195,166,167,168,197,0,195,166,167,168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -288,7 +289,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13,0,0,0,0,0,4,0,0,0,4,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,0,0,0,0,0,20,9,10,11,20,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,313,314,0,0,0,313,314,216,0,0,0,0,310,0,0,0,0,332,333,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,313,314,0,0,0,313,314,216,0,0,0,0,310,0,355,0,0,332,333,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,139,0,156,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,155,0,140,0,0,0,258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,216,0,0,189,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -363,7 +364,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,155,175,170,0,0,0,155,175,170,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,48,49,49,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,171,175,171,0,0,0,170,175,169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,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,175,171,0,0,0,170,175,169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,313,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,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,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,
@@ -684,7 +685,7 @@
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,136,0,0,0,134,135,136,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,51,0,0,0,0,0,0,51,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
-51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,136,0,0,0,134,0,136,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,51,0,0,0,0,0,0,51,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
+51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,135,136,0,0,0,134,135,136,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,51,0,0,0,0,0,0,51,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,51,46,47,0,311,311,6,51,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,51,62,63,0,263,0,0,51,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,51,0,0,0,0,0,0,51,0,0,0,0,0,0,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,
@@ -974,7 +975,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="106" height="157">
+ <layer name="Collision" width="106" height="157" visible="0">
<data encoding="csv">
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1032,9 +1033,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
2,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,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,0,0,0,0,2,2,2,0,2,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,2,2,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,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,2,2,2,2,2,2,2,2,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,2,2,2,2,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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,0,0,0,0,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,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,0,0,0,0,2,2,2,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,0,0,0,0,0,0,0,0,0,0,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,2,2,0,0,0,2,2,2,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,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,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,
@@ -1093,7 +1094,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,0,0,0,0,2,0,0,0,0,2,2,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,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,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,0,0,0,0,0,0,0,0,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,2,0,0,0,0,0,0,0,0,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,2,0,0,0,0,0,0,0,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1213,5 +1214,6 @@
<property name="dest_tile_y" value="25"/>
</properties>
</object>
+ <object id="36" name="Alchemy" type="node" x="1120" y="3744" width="32" height="32"/>
</objectgroup>
</map>
diff --git a/npcs/_include.xml b/npcs/_include.xml
index f5fff514..71ef2d29 100644
--- a/npcs/_include.xml
+++ b/npcs/_include.xml
@@ -198,6 +198,7 @@
<include name="npcs/npc396.xml"/>
<include name="npcs/npc397.xml"/>
<include name="npcs/npc398.xml"/>
+ <include name="npcs/npc399.xml"/>
<include name="npcs/npc400.xml"/>
<include name="npcs/npc401.xml"/>
<include name="npcs/npc402.xml"/>
diff --git a/npcs/npc106.xml b/npcs/npc106.xml
index 63f6f6d4..0289c8f1 100644
--- a/npcs/npc106.xml
+++ b/npcs/npc106.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<npcs>
<npc id="106">
- <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+ <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle01-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#69006a,880884,a404a2,c000c0,ff40ff</sprite>
- <sprite>equipment/feet/boots.xml|#490000,b66d49</sprite>
- <sprite>equipment/legs/skirt.xml|#251e06,443c21,71653b,a0945e</sprite>
- <sprite>equipment/chest/tanktop.xml|#1a3a8c,214cb9,4470e0,7898e8</sprite>
+ <sprite>equipment/feet/boots-female.xml|#490000,b66d49</sprite>
+ <sprite>equipment/legs/skirt-female.xml|#251e06,443c21,71653b,a0945e</sprite>
+ <sprite>equipment/chest/tanktop-female.xml|#1a3a8c,214cb9,4470e0,7898e8</sprite>
</npc>
</npcs>
diff --git a/npcs/npc108.xml b/npcs/npc108.xml
index e2c55036..579fd760 100644
--- a/npcs/npc108.xml
+++ b/npcs/npc108.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<npcs>
<npc id="108">
- <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+ <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#2b552b,55552b,55802b,80aa55,80aa80,aad480</sprite>
- <sprite>equipment/chest/fine-dress.xml|#9e005d,bc0c73,dc168b,db78a7,dea0c5,efbfdb</sprite>
+ <sprite>equipment/chest/fine-dress-female.xml|#9e005d,bc0c73,dc168b,db78a7,dea0c5,efbfdb</sprite>
</npc>
</npcs>
diff --git a/npcs/npc167.xml b/npcs/npc167.xml
index 64f7f0ef..82ece533 100644
--- a/npcs/npc167.xml
+++ b/npcs/npc167.xml
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<npcs>
<npc id="167">
- <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+ <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#2c3a0a,317300,3b8700,4ead00</sprite>
- <sprite>equipment/head/wizard-hat.xml|#4f0a76,8010c0,d699f7</sprite>
- <sprite>equipment/chest/sorcerer-robe.xml|#4f0a76,8010c0,d699f7;#EC0000</sprite>
+ <sprite>equipment/head/wizard-hat-female.xml|#4f0a76,8010c0,d699f7</sprite>
+ <sprite>equipment/chest/sorcerer-robe-female.xml|#4f0a76,8010c0,d699f7;#EC0000</sprite>
</npc>
</npcs>
diff --git a/npcs/npc182.xml b/npcs/npc182.xml
index 5ecc6f86..8d1ed215 100644
--- a/npcs/npc182.xml
+++ b/npcs/npc182.xml
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<npcs>
<npc id="182">
- <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+ <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#66500b,80630e,997711,b38b14,cc9f16,e5b319,ffc71c</sprite>
- <sprite>equipment/feet/boots.xml|#443c21,71653b</sprite>
- <sprite>equipment/legs/pants.xml|#115511,22aa22,99dd99</sprite>
- <sprite>equipment/chest/forest-armor.xml</sprite>
- <sprite>equipment/head/fairy_hat.xml</sprite>
+ <sprite>equipment/feet/boots-female.xml|#443c21,71653b</sprite>
+ <sprite>equipment/legs/pants-female.xml|#115511,22aa22,99dd99</sprite>
+ <sprite>equipment/chest/forest-armor-female.xml</sprite>
+ <sprite>equipment/head/fairy_hat-female.xml</sprite>
<sprite>equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
</npc>
</npcs>
diff --git a/npcs/npc201.xml b/npcs/npc201.xml
index 62b9d835..fc4788b1 100644
--- a/npcs/npc201.xml
+++ b/npcs/npc201.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<npcs>
<npc id="201">
- <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+ <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#bb2222,ffee33</sprite>
- <sprite>equipment/feet/boots.xml|#4f2d29,c89078</sprite>
- <sprite>equipment/legs/chaps.xml</sprite>
- <sprite>equipment/chest/shorttanktop.xml</sprite>
+ <sprite>equipment/feet/boots-female.xml|#4f2d29,c89078</sprite>
+ <sprite>equipment/legs/chaps-female.xml</sprite>
+ <sprite>equipment/chest/shorttanktop-female.xml</sprite>
</npc>
</npcs>
diff --git a/npcs/npc370.xml b/npcs/npc370.xml
index c830f2bc..5fc3735a 100644
--- a/npcs/npc370.xml
+++ b/npcs/npc370.xml
@@ -2,11 +2,11 @@
<npcs>
<npc id="370">
<particlefx>graphics/particles/power-circle.particle.xml</particlefx>
- <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+ <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#602486,934cc3,fdc689</sprite>
- <sprite>equipment/feet/assassin-boots.xml</sprite>
- <sprite>equipment/legs/shorts.xml|#121212,343434</sprite>
- <sprite>equipment/chest/sorcerer-robe.xml|#121212,343434;#468AD6</sprite>
- <sprite>equipment/head/wizard-hat.xml|#070707,121212,5B9BC2</sprite>
+ <sprite>equipment/feet/assassin-boots-female.xml</sprite>
+ <sprite>equipment/legs/shorts-female.xml|#121212,343434</sprite>
+ <sprite>equipment/chest/sorcerer-robe-female.xml|#121212,343434;#468AD6</sprite>
+ <sprite>equipment/head/wizard-hat-female.xml|#070707,121212,5B9BC2</sprite>
</npc>
</npcs>
diff --git a/npcs/npc371.xml b/npcs/npc371.xml
index 20851631..f6da934e 100644
--- a/npcs/npc371.xml
+++ b/npcs/npc371.xml
@@ -2,11 +2,11 @@
<npcs>
<npc id="371">
<particlefx>graphics/particles/monster-luvia.particle.xml</particlefx>
- <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+ <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#8c6625,dab425,ffffff</sprite>
- <sprite>equipment/feet/assassin-boots.xml</sprite>
- <sprite>equipment/legs/shorts.xml|#121212,343434</sprite>
- <sprite>equipment/chest/sorcerer-robe.xml|#121212,343434;#8F47D6</sprite>
- <sprite>equipment/head/wizard-hat.xml|#070707,121212,663399</sprite>
+ <sprite>equipment/feet/assassin-boots-female.xml</sprite>
+ <sprite>equipment/legs/shorts-female.xml|#121212,343434</sprite>
+ <sprite>equipment/chest/sorcerer-robe-female.xml|#121212,343434;#8F47D6</sprite>
+ <sprite>equipment/head/wizard-hat-female.xml|#070707,121212,663399</sprite>
</npc>
</npcs>
diff --git a/npcs/npc376.xml b/npcs/npc376.xml
index fb86b519..877f2cc5 100644
--- a/npcs/npc376.xml
+++ b/npcs/npc376.xml
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<npcs>
<npc id="376">
- <sprite>model/base.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+ <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
<sprite>hairstyles/hairstyle11-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#dbd41e,867f1a,a49c2e,b2aa4f,c6c170,d9d394,e0dcb3</sprite>
- <sprite>equipment/chest/sorcerer-robe.xml|#115511,22aa22,99dd99;#FFF528</sprite>
+ <sprite>equipment/chest/sorcerer-robe-female.xml|#115511,22aa22,99dd99;#FFF528</sprite>
<sprite variant="0">npcs/weaver-wheel.xml</sprite>
</npc>
</npcs>
diff --git a/npcs/npc399.xml b/npcs/npc399.xml
new file mode 100644
index 00000000..14fca3bd
--- /dev/null
+++ b/npcs/npc399.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<npcs>
+ <npc id="399" hoverCursor="action"/>
+</npcs>
diff --git a/tilesets/wood_lab_small.tsx b/tilesets/wood_lab_small.tsx
new file mode 100644
index 00000000..f6f509a9
--- /dev/null
+++ b/tilesets/wood_lab_small.tsx
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset name="wood_lab_small" tilewidth="64" tileheight="96">
+ <image source="../graphics/tiles/wood_lab_small.png" width="512" height="96"/>
+ <tile id="0">
+ <properties>
+ <property name="animation-delay0" value="5"/>
+ <property name="animation-delay1" value="5"/>
+ <property name="animation-delay2" value="5"/>
+ <property name="animation-delay3" value="5"/>
+ <property name="animation-delay4" value="5"/>
+ <property name="animation-delay5" value="5"/>
+ <property name="animation-delay6" value="5"/>
+ <property name="animation-delay7" value="5"/>
+ <property name="animation-frame0" value="1"/>
+ <property name="animation-frame1" value="2"/>
+ <property name="animation-frame2" value="3"/>
+ <property name="animation-frame3" value="4"/>
+ <property name="animation-frame4" value="5"/>
+ <property name="animation-frame5" value="6"/>
+ <property name="animation-frame6" value="7"/>
+ <property name="animation-frame7" value="0"/>
+ </properties>
+ </tile>
+</tileset>