From 19808c1297c08d4ce723a8dbc36330e538b395c5 Mon Sep 17 00:00:00 2001 From: Micksha Date: Thu, 25 Oct 2018 15:58:55 +0200 Subject: Add 4 different potions, implement 3 healing -/ 3 mana -/ concentration and iron potions. only healing potions working for now. --- LICENSE | 4 +++ graphics/items/usable/potion1.png | Bin 0 -> 711 bytes graphics/items/usable/potion2.png | Bin 0 -> 933 bytes graphics/items/usable/potion3.png | Bin 0 -> 904 bytes graphics/items/usable/potion4.png | Bin 0 -> 783 bytes items.xml | 65 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+) create mode 100644 graphics/items/usable/potion1.png create mode 100644 graphics/items/usable/potion2.png create mode 100644 graphics/items/usable/potion3.png create mode 100644 graphics/items/usable/potion4.png diff --git a/LICENSE b/LICENSE index a92b6cc3..ab360cfb 100644 --- a/LICENSE +++ b/LICENSE @@ -204,6 +204,10 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE graphics/items/usable/pioulegs.png (Reid) (CC BY-SA 3.0) (FotherJ) graphics/items/usable/piouegg.png (Reid) (CC BY-SA 3.0) (-) graphics/items/usable/plushroom.png (Reid) (CC BY-SA 3.0) (-) + graphics/items/usable/potion1.png (Reid) (CC BY-SA 3.0) (Micksha) + graphics/items/usable/potion2.png (Reid) (CC BY-SA 3.0) (Micksha) + graphics/items/usable/potion3.png (Reid) (CC BY-SA 3.0) (Micksha) + graphics/items/usable/potion4.png (Reid) (CC BY-SA 3.0) (Micksha) graphics/items/usable/pumpkinjuice.png (Enchilado) (CC BY-SA 3.0) (Reid) graphics/items/usable/pumpkinseeds.png (Enchilado) (CC BY-SA 3.0) (-) graphics/items/usable/roastedmaggot.png (LEGACY) (CC BY-SA 3.0) (Micksha) diff --git a/graphics/items/usable/potion1.png b/graphics/items/usable/potion1.png new file mode 100644 index 00000000..62df8acd Binary files /dev/null and b/graphics/items/usable/potion1.png differ diff --git a/graphics/items/usable/potion2.png b/graphics/items/usable/potion2.png new file mode 100644 index 00000000..c325ba23 Binary files /dev/null and b/graphics/items/usable/potion2.png differ diff --git a/graphics/items/usable/potion3.png b/graphics/items/usable/potion3.png new file mode 100644 index 00000000..d8ccffad Binary files /dev/null and b/graphics/items/usable/potion3.png differ diff --git a/graphics/items/usable/potion4.png b/graphics/items/usable/potion4.png new file mode 100644 index 00000000..5d9253f9 Binary files /dev/null and b/graphics/items/usable/potion4.png differ diff --git a/items.xml b/items.xml index 9d2d615d..d444829e 100644 --- a/items.xml +++ b/items.xml @@ -556,6 +556,71 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. type="usable" weight="10" maxFloorOffset="6"/> + + + + + + + + +>>>>>>> Add 4 different potions, implement 3 healing -/ 3 mana -/ concentration and iron potions. only healing potions working for now.