summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--LICENSE6
-rw-r--r--graphics/items/usable/card/merc0.pngbin0 -> 497 bytes
-rw-r--r--graphics/items/usable/card/merc1.pngbin0 -> 827 bytes
-rw-r--r--graphics/items/usable/card/merc2.pngbin0 -> 962 bytes
-rw-r--r--graphics/items/usable/card/merc3.pngbin0 -> 977 bytes
-rw-r--r--graphics/items/usable/card/merc4.pngbin0 -> 1007 bytes
-rw-r--r--graphics/items/usable/card/merc5.pngbin0 -> 1009 bytes
-rw-r--r--items.xml42
-rw-r--r--maps/018-7-1.tmx4
9 files changed, 29 insertions, 23 deletions
diff --git a/LICENSE b/LICENSE
index 16788f80..cfa3eb06 100644
--- a/LICENSE
+++ b/LICENSE
@@ -798,6 +798,12 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/items/usable/card/necromancercard.png (Saulc) (GPLv2) (Aline/TMW-Br)
graphics/items/usable/card/paladincard.png (Saulc) (GPLv2) (Aline/TMW-Br)
graphics/items/usable/card/slidecard.png (Saulc) (GPLv2) (Aline/TMW-Br)
+ graphics/items/usable/card/merc0.png (seeds) (GPLv3/CC BY-SA 4.0) (Jesusalva)
+ graphics/items/usable/card/merc1.png (seeds) (GPLv3/CC BY-SA 4.0) (Jesusalva)
+ graphics/items/usable/card/merc2.png (seeds) (GPLv3/CC BY-SA 4.0) (Jesusalva)
+ graphics/items/usable/card/merc3.png (seeds) (GPLv3/CC BY-SA 4.0) (Jesusalva)
+ graphics/items/usable/card/merc4.png (seeds) (GPLv3/CC BY-SA 4.0) (Jesusalva)
+ graphics/items/usable/card/merc5.png (seeds) (GPLv3/CC BY-SA 4.0) (Jesusalva)
#### Egg
graphics/items/usable/egg/cavesnakeegg.png (Saulc) (CC BY-SA 3.0) (Fate)
graphics/items/usable/egg/easteregg.png (Reid) (CC BY-SA 3.0) (-)
diff --git a/graphics/items/usable/card/merc0.png b/graphics/items/usable/card/merc0.png
new file mode 100644
index 00000000..b64c18ee
--- /dev/null
+++ b/graphics/items/usable/card/merc0.png
Binary files differ
diff --git a/graphics/items/usable/card/merc1.png b/graphics/items/usable/card/merc1.png
new file mode 100644
index 00000000..dff8d9f4
--- /dev/null
+++ b/graphics/items/usable/card/merc1.png
Binary files differ
diff --git a/graphics/items/usable/card/merc2.png b/graphics/items/usable/card/merc2.png
new file mode 100644
index 00000000..c9283fd8
--- /dev/null
+++ b/graphics/items/usable/card/merc2.png
Binary files differ
diff --git a/graphics/items/usable/card/merc3.png b/graphics/items/usable/card/merc3.png
new file mode 100644
index 00000000..e4aa6d5b
--- /dev/null
+++ b/graphics/items/usable/card/merc3.png
Binary files differ
diff --git a/graphics/items/usable/card/merc4.png b/graphics/items/usable/card/merc4.png
new file mode 100644
index 00000000..a88a2247
--- /dev/null
+++ b/graphics/items/usable/card/merc4.png
Binary files differ
diff --git a/graphics/items/usable/card/merc5.png b/graphics/items/usable/card/merc5.png
new file mode 100644
index 00000000..ef685b64
--- /dev/null
+++ b/graphics/items/usable/card/merc5.png
Binary files differ
diff --git a/items.xml b/items.xml
index efac87a3..4c3883bf 100644
--- a/items.xml
+++ b/items.xml
@@ -8530,28 +8530,28 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
7~8: ★★
9~A: ★ -->
<item id="7510"
- image="usable/card/herocard.png"
+ image="usable/card/merc5.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"
+ image="usable/card/merc5.png"
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"
+ image="usable/card/merc5.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"
+ image="usable/card/merc5.png"
name="Xanthem Card ★★★★★"
description="Summons Xanthem to your aid. Ranged."
effect="Summon a Mercenary for 10 minutes"
@@ -8559,28 +8559,28 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="5"/>
<item id="7530"
- image="usable/card/herocard.png"
+ image="usable/card/merc4.png"
name="Aisen Card ★★★★"
description="Summons Aisen to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7531"
- image="usable/card/herocard.png"
+ image="usable/card/merc4.png"
name="Msawis Card ★★★★"
description="Summons Msawis to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7532"
- image="usable/card/herocard.png"
+ image="usable/card/merc4.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"
+ image="usable/card/merc4.png"
name="Swezanne Card ★★★★"
description="Summons Swezanne to your aid. Ranged."
effect="Summon a Mercenary for 10 minutes"
@@ -8588,28 +8588,28 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="5"/>
<item id="7550"
- image="usable/card/herocard.png"
+ image="usable/card/merc3.png"
name="Saulc Card ★★★"
description="Summons Saulc to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7551"
- image="usable/card/herocard.png"
+ image="usable/card/merc3.png"
name="Crazyfefe Card ★★★"
description="Summons Crazyfefe to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7552"
- image="usable/card/herocard.png"
+ image="usable/card/merc3.png"
name="LawnCable Card ★★★"
description="Summons LawnCable to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7553"
- image="usable/card/herocard.png"
+ image="usable/card/merc3.png"
name="Arthur Card ★★★"
description="Summons Arthur to your aid. Ranged."
effect="Summon a Mercenary for 10 minutes"
@@ -8617,28 +8617,28 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="5"/>
<item id="7570"
- image="usable/card/herocard.png"
+ image="usable/card/merc2.png"
name="Pookie Card ★★"
description="Summons Pookie to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7571"
- image="usable/card/herocard.png"
+ image="usable/card/merc2.png"
name="Jesusalva Card ★★"
description="Summons Jesusalva to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7572"
- image="usable/card/herocard.png"
+ image="usable/card/merc2.png"
name="Demure Card ★★"
description="Summons Demure to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7573"
- image="usable/card/herocard.png"
+ image="usable/card/merc2.png"
name="Earth Witch Card ★★"
description="Summons Earth Witch to your aid. Ranged."
effect="Summon a Mercenary for 10 minutes"
@@ -8646,35 +8646,35 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="5"/>
<item id="7590"
- image="usable/card/herocard.png"
+ image="usable/card/merc1.png"
name="Apane Card ★"
description="Summons Apane to your aid?!"
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7591"
- image="usable/card/herocard.png"
+ image="usable/card/merc1.png"
name="Soren Card ★"
description="Summons Soren to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7592"
- image="usable/card/herocard.png"
+ image="usable/card/merc1.png"
name="GonzoDark Card ★"
description="Summons GonzoDark to your aid."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7593"
- image="usable/card/herocard.png"
+ image="usable/card/merc1.png"
name="Rosa Card ★"
description="Summons Rosa to your aid. Ranged."
effect="Summon a Mercenary for 10 minutes"
type="usable"
weight="5"/>
<item id="7594"
- image="usable/card/herocard.png"
+ image="usable/card/merc0.png"
name="Event Horizon Card ★★★★★★"
description="Event Mercenary."
effect="Summon a Mercenary for 1 hour. Reusable."
diff --git a/maps/018-7-1.tmx b/maps/018-7-1.tmx
index 6fc8dc3c..798f3f9b 100644
--- a/maps/018-7-1.tmx
+++ b/maps/018-7-1.tmx
@@ -574,7 +574,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
</data>
</layer>
- <layer id="5" name="Collision" width="120" height="120">
+ <layer id="5" name="Collision" width="120" height="120" 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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -822,7 +822,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
</data>
</layer>
- <objectgroup id="6" name="Objects">
+ <objectgroup id="6" name="Objects" visible="0">
<object id="1" name="graphics/particles/geyser.xml" type="PARTICLE_EFFECT" x="2720" y="2112" width="32" height="32"/>
<object id="2" name="graphics/particles/warp.xml" type="PARTICLE_EFFECT" x="1952" y="1184" width="32" height="32"/>
<object id="3" name="graphics/particles/waterfall.particle.xml" type="PARTICLE_EFFECT" x="2848" y="1472" width="32" height="32"/>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 17:42:41 +0000