Prepare Christmas Special Awesomeness (all our heroes are currently naked)

2 files changed, 518 insertions, 3 deletions

diff --git a/items.xml b/items.xml
index 71084509..586e2180 100644
--- a/items.xml
+++ b/items.xml
@@ -27,7 +27,9 @@ Copyright (C) 2018 TMW2: Moubootaur Legends
 6000	6499        = Ranged Weapons
 6500	6999        = Ammo
 7000	7399        = Magical Weapons (MAtk weapons)
-7400    9999        = Others
+7400    7499        = System Reserved
+7500    7699        = Mercenary Cards
+7700    9999        = System Reserved
 Colors for dyeable equipments or items are set up by itemcolors.xml.
 -->
 
@@ -6318,4 +6320,140 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 			/>
 		</inventory>
 	</item>
+    <!-- Mercenary Boxsets (7500 - 7509) and cards (7510-7599) -->
+	<item id="7500"
+		image="usable/box/prismgift.png"
+		name="Mercenary Boxset"
+		description="Test your luck, test your luck!"
+		type="usable"
+		useButton="Open"
+		weight="85"
+		sellProtected="true"/>
+	<item id="7501"
+		image="usable/box/prismgift.png"
+		name="Mercenary Boxset+"
+		description="Test your luck, test your luck!"
+		type="usable"
+		useButton="Open"
+		weight="115"
+		sellProtected="true"/>
+	<item id="7502"
+		image="usable/box/prismgift.png"
+		name="Mercenary Boxset++"
+		description="Test your luck, test your luck!"
+		type="usable"
+		useButton="Open"
+		weight="135"
+		sellProtected="true"/>
+
+    <!-- Second digit rule:
+            0:    Boxset
+            1~2: ★★★★★
+            3~4: ★★★★
+            5~6: ★★★
+            7~8: ★★
+            9~A: ★                  -->
+	<item id="7510"
+		image="usable/card/herocard.png"
+		name="Andrei Sakar Card ★★★★★"
+		description="Summons Andrei Sakar to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7511"
+		image="usable/card/herocard.png"
+		name="DragonStar Card ★★★★★"
+		description="Summons DragonStar to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+
+	<item id="7530"
+		image="usable/card/herocard.png"
+		name="Aisen Card ★★★★"
+		description="Summons Aisen to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7531"
+		image="usable/card/herocard.png"
+		name="Msawis Card ★★★★"
+		description="Summons Msawis to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7532"
+		image="usable/card/herocard.png"
+		name="Swezanne Card ★★★★"
+		description="Summons Swezanne to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+
+	<item id="7550"
+		image="usable/card/herocard.png"
+		name="Saulc Card ★★★"
+		description="Summons Saulc to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7551"
+		image="usable/card/herocard.png"
+		name="Crazyfefe Card ★★★"
+		description="Summons Crazyfefe to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7552"
+		image="usable/card/herocard.png"
+		name="LawnCable Card ★★★"
+		description="Summons LawnCable to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+
+	<item id="7570"
+		image="usable/card/herocard.png"
+		name="Pookie Card ★★"
+		description="Summons Pookie to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7571"
+		image="usable/card/herocard.png"
+		name="Jesusalva Card ★★"
+		description="Summons Jesusalva to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7572"
+		image="usable/card/herocard.png"
+		name="Demure Card ★★"
+		description="Summons Demure to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+
+	<item id="7590"
+		image="usable/card/herocard.png"
+		name="Apane Card ★"
+		description="Summons Apane to your aid?!"
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7591"
+		image="usable/card/herocard.png"
+		name="Soren Card ★"
+		description="Summons Soren to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+	<item id="7592"
+		image="usable/card/herocard.png"
+		name="GonzoDark Card ★"
+		description="Summons GonzoDark to your aid."
+		effect="Summon a Mercenary for 5 minutes"
+		type="usable"
+		weight="5"/>
+
 </items>
diff --git a/mercenaries.xml b/mercenaries.xml
index 048dfcf0..c4ea8288 100644
--- a/mercenaries.xml
+++ b/mercenaries.xml
@@ -5,7 +5,7 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 
 <mercenaries>
     <mercenary
-        id="3000"
+        id="1191"
         name="merc"
         startFollowDistance="3"
         followDistance="1"
@@ -29,7 +29,7 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
         <sprite>races/human-male.xml</sprite>
     </mercenary>
     <mercenary
-        id="3001"
+        id="1192"
         name="Andrei Sakar"
         startFollowDistance="3"
         followDistance="1"
@@ -58,4 +58,381 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
 	    <sprite>equipment/legs/bromenalpants-male.xml</sprite>
 	    <sprite>equipment/feet/boots-male.xml|#212121</sprite>
     </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/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1194"
+        name="Aisen"
+        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/hairstyle11.xml|#273a2e,2f4a37,2c5235,3a6935,4b802c,8bb449,d2e489</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1195"
+        name="Msawis"
+        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/hairstyle9.xml|#000002,020004,0d0d13,181c20,2b302d,616b64,c7ccbf</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1196"
+        name="Saulc"
+        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/hairstyle14.xml|#2b2b2b,683c57,3f3f3f,75405b,585858,b75a76,858585,db7b88,a7a7a7,ff9b9b,d6d6d6,ffd7b9,ffffff,fffff8</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1197"
+        name="Crazyfefe"
+        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/hairstyle14.xml|#2b2b2b,382140,3f3f3f,3a254e,585858,3b3769,858585,3c3d83,a7a7a7,4246a6,d6d6d6,5a9cdb,ffffff,afedd2</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1198"
+        name="Lawn Cable"
+        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/hairstyle14.xml|#2b2b2b,192d2c,3f3f3f,1c3e33,585858,2c6b52,858585,339455,a7a7a7,32ae4d,d6d6d6,95d469,ffffff,f7fed5</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1199"
+        name="Demure"
+        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/hairstyle15.xml|#2b2b2b,2b384d,3f3f3f,29445d,585858,296484,858585,367c9f,a7a7a7,50a8ce,d6d6d6,99d4e3,ffffff,e2fdf6</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1200"
+        name="Pookie"
+        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/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1201"
+        name="Jesus Salva"
+        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/hairstyle06.xml|#2b2b2b,000002,3f3f3f,020004,585858,0d0d13,858585,181c20,a7a7a7,2b302d,d6d6d6,616b64,ffffff,c7ccbf</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1202"
+        name="Gonzo Dark"
+        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/hairstyle04.xml|#2b2b2b,37273b,3f3f3f,422c48,585858,615282,858585,6f78ab,a7a7a7,90abcd,d6d6d6,96cdd9,ffffff,d1e9eb</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1203"
+        name="Legendary Apane"
+        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/hairstyle21.xml|#4b3e44,59494c,887565,a29171,ccbb9b,e7debd,faf8f1</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1204"
+        name="Soren"
+        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/hairstyle01.xml|#ffffff</sprite>
+
+	    <sprite>equipment/weapons/lidersword.xml</sprite>
+    </mercenary>
+
+    <!-- Boxset -->
+    <mercenary
+        id="1205"
+        name="Sweezanne"
+        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/weapons/lidersword.xml</sprite>
+    </mercenary>
 </mercenaries>