From 0488474729c7de6159f560163421ebaebf9c0142 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 7 Mar 2021 14:56:49 -0300
Subject: Add fruits and pinkie crystal by Cadis. I thought it was using
 Fother's bottled pinkie image but I guess I was wrong!

---
 LICENSE                               |  12 ++++++++++--
 graphics/items/usable/fruits/agi.png  | Bin 0 -> 965 bytes
 graphics/items/usable/fruits/dex.png  | Bin 0 -> 995 bytes
 graphics/items/usable/fruits/int.png  | Bin 0 -> 996 bytes
 graphics/items/usable/fruits/luk.png  | Bin 0 -> 981 bytes
 graphics/items/usable/fruits/str.png  | Bin 0 -> 957 bytes
 graphics/items/usable/fruits/vit.png  | Bin 0 -> 949 bytes
 graphics/items/usable/pets/pinkie.png | Bin 0 -> 2604 bytes
 items.xml                             |  14 +++++++-------
 maps/018-7-1.tmx                      |   3 ++-
 10 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 graphics/items/usable/fruits/agi.png
 create mode 100644 graphics/items/usable/fruits/dex.png
 create mode 100644 graphics/items/usable/fruits/int.png
 create mode 100644 graphics/items/usable/fruits/luk.png
 create mode 100644 graphics/items/usable/fruits/str.png
 create mode 100644 graphics/items/usable/fruits/vit.png
 create mode 100644 graphics/items/usable/pets/pinkie.png

diff --git a/LICENSE b/LICENSE
index 4bdda7b8..cc700f35 100644
--- a/LICENSE
+++ b/LICENSE
@@ -742,7 +742,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/items/usable/pumpkinseed.png (Enchilado)                       (CC BY-SA 3.0)          (-)
 	graphics/items/usable/urchinmeat.png (Alige)                            (CC BY-SA 3.0)          (Reid)
 	graphics/items/usable/venum.png (Enchilado)                             (CC BY-SA 3.0)          (-)
-	graphics/items/usable/warpcrystal.png (Crush)                           (CC BY-SA 3.0)          (Enchilado)
+	graphics/items/usable/warpcrystal.png (Crush)                           (GPLv3)                 (Enchilado)
 #### Bags
 	graphics/items/usable/bags/arrow1.png (YuckFou)                         (CC BY-SA 4.0)          (-)
 	graphics/items/usable/bags/arrow2.png (YuckFou)                         (CC BY-SA 4.0)          (-)
@@ -904,8 +904,15 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/items/usable/food/xmascake.png (?)                             (GPLv2)                 (Enchilado)
 	graphics/items/usable/food/xmascandycane.png (Kekskiller)               (GPLv2)                 (Enchilado)
 	graphics/items/usable/food/zombienachos.png (FotherJ)                   (CC BY-SA 3.0)          (Enchilado)
+#### Fruits
+	graphics/items/usable/fruits/agi.png (Mathias Cronqvist)                (CC BY-SA 4.0)          (-)
+	graphics/items/usable/fruits/dex.png (Mathias Cronqvist)                (CC BY-SA 4.0)          (-)
+	graphics/items/usable/fruits/int.png (Mathias Cronqvist)                (CC BY-SA 4.0)          (-)
+	graphics/items/usable/fruits/luk.png (Mathias Cronqvist)                (CC BY-SA 4.0)          (-)
+	graphics/items/usable/fruits/str.png (Mathias Cronqvist)                (CC BY-SA 4.0)          (-)
+	graphics/items/usable/fruits/vit.png (Mathias Cronqvist)                (CC BY-SA 4.0)          (-)
 #### Pets
-	graphics/items/usable/pets/bhopegg.png (Saulc)                          (CC BY-SA 3.0)          (-)
+	graphics/items/usable/pets/bhopegg.png (Saulc)                          (CC BY-SA 4.0)          (-)
 	graphics/items/usable/pets/cat.png (?)                                  (GPL v2)                (LoF)
 	graphics/items/usable/pets/cat-black.png (?)                            (GPL v2)                (LoF)
 	graphics/items/usable/pets/dog.png (Indigovox)                          (GPL v2)                (TMW-BR)
@@ -914,6 +921,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/items/usable/pets/fluffy.png (+seeds)                          (CC BY-SA 4.0)          (-)
 	graphics/items/usable/pets/maggotcocoon.png (Saulc)                     (CC BY-SA 3.0)          (-)
 	graphics/items/usable/pets/moggunegg.png (Reid)                         (CC BY-SA 3.0)          (Kolchak)
+	graphics/items/usable/pets/pinkie.png (Mathias Cronqvist)               (GPL v3)                (Crush, Enchilado)
 	graphics/items/usable/pets/piouegg.png (Reid)                           (CC BY-SA 3.0)          (-)
 	graphics/items/usable/pets/ratte.png (Indigovox)                        (GPL v2)                (TMW-BR)
 #### Potion
diff --git a/graphics/items/usable/fruits/agi.png b/graphics/items/usable/fruits/agi.png
new file mode 100644
index 00000000..db6354bf
Binary files /dev/null and b/graphics/items/usable/fruits/agi.png differ
diff --git a/graphics/items/usable/fruits/dex.png b/graphics/items/usable/fruits/dex.png
new file mode 100644
index 00000000..9105bd9c
Binary files /dev/null and b/graphics/items/usable/fruits/dex.png differ
diff --git a/graphics/items/usable/fruits/int.png b/graphics/items/usable/fruits/int.png
new file mode 100644
index 00000000..b58e4351
Binary files /dev/null and b/graphics/items/usable/fruits/int.png differ
diff --git a/graphics/items/usable/fruits/luk.png b/graphics/items/usable/fruits/luk.png
new file mode 100644
index 00000000..629d0344
Binary files /dev/null and b/graphics/items/usable/fruits/luk.png differ
diff --git a/graphics/items/usable/fruits/str.png b/graphics/items/usable/fruits/str.png
new file mode 100644
index 00000000..6ac662d4
Binary files /dev/null and b/graphics/items/usable/fruits/str.png differ
diff --git a/graphics/items/usable/fruits/vit.png b/graphics/items/usable/fruits/vit.png
new file mode 100644
index 00000000..72a24819
Binary files /dev/null and b/graphics/items/usable/fruits/vit.png differ
diff --git a/graphics/items/usable/pets/pinkie.png b/graphics/items/usable/pets/pinkie.png
new file mode 100644
index 00000000..5556f04b
Binary files /dev/null and b/graphics/items/usable/pets/pinkie.png differ
diff --git a/items.xml b/items.xml
index a1359f6c..0a07053e 100644
--- a/items.xml
+++ b/items.xml
@@ -7221,7 +7221,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="360"
 	/>
 	<item id="4012"
-		image="equipment/head/pinkiehat.png"
+		image="usable/pets/pinkie.png"
 		name="Pinkie Crystal"
 		description="I don't think you should summon this. It might be a bad idea."
 		type="generic"
@@ -8715,7 +8715,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="0"/>
 	<!-- Other usable items -->
 	<item id="8000"
-		image="usable/food/plum.png"
+		image="usable/fruits/str.png"
 		name="Strength Fruit"
 		description="Feel the power growing on you!"
 		useButton="Eat"
@@ -8723,7 +8723,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="8001"
-		image="usable/food/plum.png"
+		image="usable/fruits/agi.png"
 		name="Agility Fruit"
 		description="Feel the power growing on you!"
 		useButton="Eat"
@@ -8731,7 +8731,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="8002"
-		image="usable/food/plum.png"
+		image="usable/fruits/vit.png"
 		name="Vitality Fruit"
 		description="Feel the power growing on you!"
 		useButton="Eat"
@@ -8739,7 +8739,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="8003"
-		image="usable/food/plum.png"
+		image="usable/fruits/int.png"
 		name="Intelligence Fruit"
 		description="Feel the power growing on you!"
 		useButton="Eat"
@@ -8747,7 +8747,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="8004"
-		image="usable/food/plum.png"
+		image="usable/fruits/dex.png"
 		name="Dexterity Fruit"
 		description="Feel the power growing on you!"
 		useButton="Eat"
@@ -8755,7 +8755,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="8005"
-		image="usable/food/plum.png"
+		image="usable/fruits/luk.png"
 		name="Luck Fruit"
 		description="Feel the power growing on you!"
 		useButton="Eat"
diff --git a/maps/018-7-1.tmx b/maps/018-7-1.tmx
index 61ac77fe..eddeb4ea 100644
--- a/maps/018-7-1.tmx
+++ b/maps/018-7-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="9">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="10">
  <properties>
   <property name="author" value="Tametomo Aethyra"/>
   <property name="background0image" value="graphics/images/seaofclouds_1024x1024.png"/>
@@ -865,5 +865,6 @@
     <property name="dest_y" value="71"/>
    </properties>
   </object>
+  <object id="9" name="graphics/particles/waterfall.particle.xml" type="PARTICLE_EFFECT" x="2816" y="1472" width="32" height="32"/>
  </objectgroup>
 </map>
-- 
cgit v1.2.3-60-g2f50