summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE6
-rw-r--r--graphics/items/usable/box/merc0.pngbin0 -> 1630 bytes
-rw-r--r--graphics/items/usable/box/merc1.pngbin0 -> 1858 bytes
-rw-r--r--graphics/items/usable/box/merc2.pngbin0 -> 1893 bytes
-rw-r--r--graphics/items/usable/box/merc3.pngbin0 -> 1830 bytes
-rw-r--r--graphics/items/usable/box/merc4.pngbin0 -> 1844 bytes
-rw-r--r--graphics/items/usable/box/merc5.pngbin0 -> 1810 bytes
-rw-r--r--items.xml20
8 files changed, 16 insertions, 10 deletions
diff --git a/LICENSE b/LICENSE
index cfa3eb06..cde04cb4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -784,6 +784,12 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/items/usable/box/prismgift.png (jesusalva) (CC BY-SA 3.0) (Enchilado)
graphics/items/usable/box/silvergift.png (jesusalva) (CC BY-SA 3.0) (Enchilado)
graphics/items/usable/box/supremegift.png (jesusalva) (CC BY-SA 3.0) (Enchilado)
+ graphics/items/usable/box/merc0.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/merc1.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/merc2.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/merc3.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/merc4.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/merc5.png (TMW-Br v2) (?) (+seeds, Jesusalva)
#### Candy
graphics/items/usable/candy/lawncandy.png (Saulc) (CC BY-SA 3.0) (Lawncable)
graphics/items/usable/candy/manapop.png (Saulc) (GPLv2) (Wombat)
diff --git a/graphics/items/usable/box/merc0.png b/graphics/items/usable/box/merc0.png
new file mode 100644
index 00000000..419d4876
--- /dev/null
+++ b/graphics/items/usable/box/merc0.png
Binary files differ
diff --git a/graphics/items/usable/box/merc1.png b/graphics/items/usable/box/merc1.png
new file mode 100644
index 00000000..0da9dbda
--- /dev/null
+++ b/graphics/items/usable/box/merc1.png
Binary files differ
diff --git a/graphics/items/usable/box/merc2.png b/graphics/items/usable/box/merc2.png
new file mode 100644
index 00000000..eba52f93
--- /dev/null
+++ b/graphics/items/usable/box/merc2.png
Binary files differ
diff --git a/graphics/items/usable/box/merc3.png b/graphics/items/usable/box/merc3.png
new file mode 100644
index 00000000..5128169f
--- /dev/null
+++ b/graphics/items/usable/box/merc3.png
Binary files differ
diff --git a/graphics/items/usable/box/merc4.png b/graphics/items/usable/box/merc4.png
new file mode 100644
index 00000000..a2c51cca
--- /dev/null
+++ b/graphics/items/usable/box/merc4.png
Binary files differ
diff --git a/graphics/items/usable/box/merc5.png b/graphics/items/usable/box/merc5.png
new file mode 100644
index 00000000..cda06291
--- /dev/null
+++ b/graphics/items/usable/box/merc5.png
Binary files differ
diff --git a/items.xml b/items.xml
index 4c3883bf..5808b18d 100644
--- a/items.xml
+++ b/items.xml
@@ -8442,7 +8442,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
sellProtected="true"/>
<!-- Mercenary Boxsets (7500 - 7509) and cards (7510-7599) -->
<item id="7500"
- image="usable/box/prismgift.png"
+ image="usable/box/merc0.png"
name="Mercenary Boxset"
description="Test your luck, test your luck!"
type="usable"
@@ -8450,7 +8450,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="85"
sellProtected="true"/>
<item id="7501"
- image="usable/box/prismgift.png"
+ image="usable/box/merc0.png"
name="Mercenary Boxset+"
description="Test your luck, test your luck!"
type="usable"
@@ -8458,7 +8458,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="115"
sellProtected="true"/>
<item id="7502"
- image="usable/box/prismgift.png"
+ image="usable/box/merc0.png"
name="Mercenary Boxset++"
description="Test your luck, test your luck!"
type="usable"
@@ -8466,7 +8466,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="135"
sellProtected="true"/>
<item id="7503"
- image="usable/box/prismgift.png"
+ image="usable/box/merc0.png"
name="Mercenary Boxset+++"
description="Test your luck, test your luck!"
type="usable"
@@ -8474,7 +8474,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="135"
sellProtected="true"/>
<item id="7504"
- image="usable/box/prismgift.png"
+ image="usable/box/merc0.png"
name="Supreme Mercenary Boxset"
description="Test your luck, test your luck!"
type="usable"
@@ -8482,7 +8482,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="135"
sellProtected="true"/>
<item id="7505"
- image="usable/box/prismgift.png"
+ image="usable/box/merc1.png"
name="Mercenary Boxset ★"
description="Contains a mercenary."
type="usable"
@@ -8490,7 +8490,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="135"
sellProtected="true"/>
<item id="7506"
- image="usable/box/prismgift.png"
+ image="usable/box/merc2.png"
name="Mercenary Boxset ★★"
description="Contains a mercenary."
type="usable"
@@ -8498,7 +8498,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="135"
sellProtected="true"/>
<item id="7507"
- image="usable/box/prismgift.png"
+ image="usable/box/merc3.png"
name="Mercenary Boxset ★★★"
description="Contains a mercenary."
type="usable"
@@ -8506,7 +8506,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="135"
sellProtected="true"/>
<item id="7508"
- image="usable/box/prismgift.png"
+ image="usable/box/merc4.png"
name="Mercenary Boxset ★★★★"
description="Contains a mercenary."
type="usable"
@@ -8514,7 +8514,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="135"
sellProtected="true"/>
<item id="7509"
- image="usable/box/prismgift.png"
+ image="usable/box/merc5.png"
name="Mercenary Boxset ★★★★★"
description="Contains a mercenary."
type="usable"