summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-02-25 18:24:14 -0300
committerJesusaves <cpntb1@ymail.com>2021-02-25 18:24:14 -0300
commit7a08cb8d03ba933d8af1d5c0ca75ce8ad7bb1fd3 (patch)
tree157dec5c437538a0a6398cee322d7686c218aa89
parent41c15a2e1389d9a573b8bac4d18f2f10b0287dde (diff)
downloadclientdata-7a08cb8d03ba933d8af1d5c0ca75ce8ad7bb1fd3.tar.gz
clientdata-7a08cb8d03ba933d8af1d5c0ca75ce8ad7bb1fd3.tar.bz2
clientdata-7a08cb8d03ba933d8af1d5c0ca75ce8ad7bb1fd3.tar.xz
clientdata-7a08cb8d03ba933d8af1d5c0ca75ce8ad7bb1fd3.zip
The standard merc. boxset also deserves fancy art
-rw-r--r--LICENSE6
-rw-r--r--graphics/items/usable/box/mercb0.pngbin0 -> 1781 bytes
-rw-r--r--graphics/items/usable/box/mercb1.pngbin0 -> 1969 bytes
-rw-r--r--graphics/items/usable/box/mercb2.pngbin0 -> 2006 bytes
-rw-r--r--graphics/items/usable/box/mercb3.pngbin0 -> 1928 bytes
-rw-r--r--graphics/items/usable/box/mercb4.pngbin0 -> 1941 bytes
-rw-r--r--graphics/items/usable/box/mercb5.pngbin0 -> 1883 bytes
-rw-r--r--items.xml10
8 files changed, 11 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index cde04cb4..a0da7e9d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -790,6 +790,12 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
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)
+ graphics/items/usable/box/mercb0.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/mercb1.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/mercb2.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/mercb3.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/mercb4.png (TMW-Br v2) (?) (+seeds, Jesusalva)
+ graphics/items/usable/box/mercb5.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/mercb0.png b/graphics/items/usable/box/mercb0.png
new file mode 100644
index 00000000..18f61496
--- /dev/null
+++ b/graphics/items/usable/box/mercb0.png
Binary files differ
diff --git a/graphics/items/usable/box/mercb1.png b/graphics/items/usable/box/mercb1.png
new file mode 100644
index 00000000..87e2a800
--- /dev/null
+++ b/graphics/items/usable/box/mercb1.png
Binary files differ
diff --git a/graphics/items/usable/box/mercb2.png b/graphics/items/usable/box/mercb2.png
new file mode 100644
index 00000000..73f8ad43
--- /dev/null
+++ b/graphics/items/usable/box/mercb2.png
Binary files differ
diff --git a/graphics/items/usable/box/mercb3.png b/graphics/items/usable/box/mercb3.png
new file mode 100644
index 00000000..77f4a654
--- /dev/null
+++ b/graphics/items/usable/box/mercb3.png
Binary files differ
diff --git a/graphics/items/usable/box/mercb4.png b/graphics/items/usable/box/mercb4.png
new file mode 100644
index 00000000..fcb4f2fd
--- /dev/null
+++ b/graphics/items/usable/box/mercb4.png
Binary files differ
diff --git a/graphics/items/usable/box/mercb5.png b/graphics/items/usable/box/mercb5.png
new file mode 100644
index 00000000..444ec43c
--- /dev/null
+++ b/graphics/items/usable/box/mercb5.png
Binary files differ
diff --git a/items.xml b/items.xml
index 5808b18d..076a1954 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/merc0.png"
+ image="usable/box/mercb1.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/merc0.png"
+ image="usable/box/mercb2.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/merc0.png"
+ image="usable/box/mercb3.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/merc0.png"
+ image="usable/box/mercb4.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/merc0.png"
+ image="usable/box/mercb5.png"
name="Supreme Mercenary Boxset"
description="Test your luck, test your luck!"
type="usable"