Update mercenary items, add placeholders for new mercenaries (equipment pending)

2 files changed, 206 insertions, 32 deletions

diff --git a/items.xml b/items.xml
index 3b847033..5769f264 100644
--- a/items.xml
+++ b/items.xml
@@ -7409,8 +7409,22 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="5"/>
 	<item id="7511"
 		image="usable/card/herocard.png"
-		name="DragonStar Card ★★★★★"
-		description="Summons DragonStar to your aid."
+		name="Lilanna Card ★★★★★"
+		description="Summons Lilanna to your aid."
+		effect="Summon a Mercenary for 10 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7512"
+		image="usable/card/herocard.png"
+		name="Woody Card ★★★★★"
+		description="Summons Woody to your aid."
+		effect="Summon a Mercenary for 10 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7513"
+		image="usable/card/herocard.png"
+		name="Xanthem Card ★★★★★"
+		description="Summons Xanthem to your aid."
 		effect="Summon a Mercenary for 10 minutes"
 		type="usable"
 		weight="5"/>
@@ -7431,6 +7445,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="5"/>
 	<item id="7532"
 		image="usable/card/herocard.png"
+		name="DragonStar Card ★★★★"
+		description="Summons DragonStar to your aid."
+		effect="Summon a Mercenary for 10 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7533"
+		image="usable/card/herocard.png"
 		name="Swezanne Card ★★★★"
 		description="Summons Swezanne to your aid."
 		effect="Summon a Mercenary for 10 minutes"
@@ -7458,6 +7479,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		effect="Summon a Mercenary for 10 minutes"
 		type="usable"
 		weight="5"/>
+	<item id="7553"
+		image="usable/card/herocard.png"
+		name="Arthur Card ★★★"
+		description="Summons Arthur to your aid."
+		effect="Summon a Mercenary for 10 minutes"
+		type="usable"
+		weight="5"/>
 
 	<item id="7570"
 		image="usable/card/herocard.png"
@@ -7480,6 +7508,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		effect="Summon a Mercenary for 10 minutes"
 		type="usable"
 		weight="5"/>
+	<item id="7573"
+		image="usable/card/herocard.png"
+		name="Earth Witch Card ★★"
+		description="Summons Earth Witch to your aid."
+		effect="Summon a Mercenary for 10 minutes"
+		type="usable"
+		weight="5"/>
 
 	<item id="7590"
 		image="usable/card/herocard.png"
@@ -7502,5 +7537,12 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		effect="Summon a Mercenary for 10 minutes"
 		type="usable"
 		weight="5"/>
+	<item id="7593"
+		image="usable/card/herocard.png"
+		name="Rosa Card ★"
+		description="Summons Rosa to your aid."
+		effect="Summon a Mercenary for 10 minutes"
+		type="usable"
+		weight="5"/>
 
 </items>
diff --git a/mercenaries.xml b/mercenaries.xml
index 4a196b07..f9951824 100644
--- a/mercenaries.xml
+++ b/mercenaries.xml
@@ -60,36 +60,6 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
     </mercenary>
 
     <!-- Boxset -->
-    <mercenary
-        id="1193"
-        name="Dragon Star"
-        startFollowDistance="3"
-        followDistance="1"
-        warpDistance="11"
-        offsetX="0"
-        offsetY="2"
-        sitOffsetX="1"
-        sitOffsetY="0"
-        moveOffsetX="0"
-        moveOffsetY="5"
-        deadOffsetX="0"
-        deadOffsetY="0"
-        attackOffsetX="0"
-        attackOffsetY="2"
-        thinkTime="100"
-        directionType="2"
-        sitDirectionType="1"
-        deadDirectionType="1"
-        attackDirectionType="4"
-    >
-        <sprite>races/human-male.xml</sprite>
-	    <sprite>hairstyles/hairstyle02.xml|#2b2b2b,000002,3f3f3f,020004,585858,0d0d13,858585,181c20,a7a7a7,2b302d,d6d6d6,616b64,ffffff,c7ccbf</sprite>
-
-		<sprite>equipment/chest/forestarmor-male.xml</sprite>
-		<sprite>equipment/legs/luffyxsummershorts-male.xml</sprite>
-		<sprite>equipment/hands/cottongloves-male.xml|#4e2e18,c8752f</sprite>
-	    <sprite>equipment/weapons/lidersword.xml</sprite>
-    </mercenary>
 
     <!-- Boxset -->
     <mercenary
@@ -448,6 +418,136 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
     <!-- Boxset -->
     <mercenary
         id="1205"
+        name="Dragon Star"
+        startFollowDistance="3"
+        followDistance="1"
+        warpDistance="11"
+        offsetX="0"
+        offsetY="2"
+        sitOffsetX="1"
+        sitOffsetY="0"
+        moveOffsetX="0"
+        moveOffsetY="5"
+        deadOffsetX="0"
+        deadOffsetY="0"
+        attackOffsetX="0"
+        attackOffsetY="2"
+        thinkTime="100"
+        directionType="2"
+        sitDirectionType="1"
+        deadDirectionType="1"
+        attackDirectionType="4"
+    >
+        <sprite>races/human-male.xml</sprite>
+	    <sprite>hairstyles/hairstyle02.xml|#2b2b2b,000002,3f3f3f,020004,585858,0d0d13,858585,181c20,a7a7a7,2b302d,d6d6d6,616b64,ffffff,c7ccbf</sprite>
+
+		<sprite>equipment/chest/forestarmor-male.xml</sprite>
+		<sprite>equipment/legs/luffyxsummershorts-male.xml</sprite>
+		<sprite>equipment/hands/cottongloves-male.xml|#4e2e18,c8752f</sprite>
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1206"
+        name="Rosa"
+        startFollowDistance="3"
+        followDistance="1"
+        warpDistance="11"
+        offsetX="0"
+        offsetY="2"
+        sitOffsetX="1"
+        sitOffsetY="0"
+        moveOffsetX="0"
+        moveOffsetY="5"
+        deadOffsetX="0"
+        deadOffsetY="0"
+        attackOffsetX="0"
+        attackOffsetY="2"
+        thinkTime="100"
+        directionType="2"
+        sitDirectionType="1"
+        deadDirectionType="1"
+        attackDirectionType="4"
+    >
+        <sprite>races/human-female.xml</sprite>
+	    <sprite>hairstyles/hairstyle12.xml|#51341e,664224,91642f,a67b32,ccad4d,e8de6c,feffe6</sprite>
+
+		<sprite>equipment/chest/bromenalchest-female.xml</sprite>
+		<sprite>equipment/legs/cottontrousers-female.xml</sprite>
+		<sprite>equipment/head/human-eye-blink.xml</sprite>
+		<sprite>equipment/feet/boots-female.xml|#212121</sprite>
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1207"
+        name="Earth Witch"
+        startFollowDistance="3"
+        followDistance="1"
+        warpDistance="11"
+        offsetX="0"
+        offsetY="2"
+        sitOffsetX="1"
+        sitOffsetY="0"
+        moveOffsetX="0"
+        moveOffsetY="5"
+        deadOffsetX="0"
+        deadOffsetY="0"
+        attackOffsetX="0"
+        attackOffsetY="2"
+        thinkTime="100"
+        directionType="2"
+        sitDirectionType="1"
+        deadDirectionType="1"
+        attackDirectionType="4"
+    >
+        <sprite>races/human-female.xml</sprite>
+	    <sprite>hairstyles/hairstyle12.xml|#51341e,664224,91642f,a67b32,ccad4d,e8de6c,feffe6</sprite>
+
+		<sprite>equipment/chest/bromenalchest-female.xml</sprite>
+		<sprite>equipment/legs/cottontrousers-female.xml</sprite>
+		<sprite>equipment/head/human-eye-blink.xml</sprite>
+		<sprite>equipment/feet/boots-female.xml|#212121</sprite>
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1208"
+        name="Arthur"
+        startFollowDistance="3"
+        followDistance="1"
+        warpDistance="11"
+        offsetX="0"
+        offsetY="2"
+        sitOffsetX="1"
+        sitOffsetY="0"
+        moveOffsetX="0"
+        moveOffsetY="5"
+        deadOffsetX="0"
+        deadOffsetY="0"
+        attackOffsetX="0"
+        attackOffsetY="2"
+        thinkTime="100"
+        directionType="2"
+        sitDirectionType="1"
+        deadDirectionType="1"
+        attackDirectionType="4"
+    >
+        <sprite>races/human-male.xml</sprite>
+	    <sprite>hairstyles/hairstyle15.xml|#2b2b2b,382140,3f3f3f,3a254e,585858,3b3769,858585,3c3d83,a7a7a7,4246a6,d6d6d6,5a9cdb,ffffff,afedd2</sprite>
+
+		<sprite>equipment/chest/leathershirt-male.xml|#443c21,85794a,beb590,ffffff;#824035,d6a19a</sprite>
+		<sprite>equipment/legs/jeansshorts-male.xml</sprite>
+		<sprite>equipment/hands/cottongloves-male.xml|#202020,505050</sprite>
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1209"
         name="Sweezanne"
         startFollowDistance="3"
         followDistance="1"
@@ -477,4 +577,36 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 		<sprite>equipment/feet/boots-female.xml|#212121</sprite>
 	    <sprite>equipment/weapons/lidersword.xml</sprite>
     </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1210"
+        name="Xanthem"
+        startFollowDistance="3"
+        followDistance="1"
+        warpDistance="11"
+        offsetX="0"
+        offsetY="2"
+        sitOffsetX="1"
+        sitOffsetY="0"
+        moveOffsetX="0"
+        moveOffsetY="5"
+        deadOffsetX="0"
+        deadOffsetY="0"
+        attackOffsetX="0"
+        attackOffsetY="2"
+        thinkTime="100"
+        directionType="2"
+        sitDirectionType="1"
+        deadDirectionType="1"
+        attackDirectionType="4"
+    >
+        <sprite>races/human-male.xml</sprite>
+	    <sprite>hairstyles/hairstyle15.xml|#2b2b2b,382140,3f3f3f,3a254e,585858,3b3769,858585,3c3d83,a7a7a7,4246a6,d6d6d6,5a9cdb,ffffff,afedd2</sprite>
+
+		<sprite>equipment/chest/leathershirt-male.xml|#443c21,85794a,beb590,ffffff;#824035,d6a19a</sprite>
+		<sprite>equipment/legs/jeansshorts-male.xml</sprite>
+		<sprite>equipment/hands/cottongloves-male.xml|#202020,505050</sprite>
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
 </mercenaries>