Merge branch 'AFKing' into 'master'

AFKing

See merge request evol/clientdata!177

7 files changed, 55 insertions, 2 deletions

diff --git a/LICENSE b/LICENSE
index b1d875c3..1772afc8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -934,11 +934,13 @@ legal@themanaworld.org
     graphics/sprites/hairstyles/hairstyle28.png (Alige, Ivosh)              (CC BY-SA 3.0)        (Reid)
 ## Icons
     graphics/sprites/icons/concentration.png (Enchilado)                    (CC BY-SA 3.0)        (-)
+    graphics/sprites/icons/drunk.png (Micksha)                              (MIT)                 (-)
     graphics/sprites/icons/healing.png (Coolkid782)                         (CC BY-SA 3.0)        (-)
     graphics/sprites/icons/hide.png (Fate)                                  (CC BY-SA 3.0)        (-)
     graphics/sprites/icons/invisible.png (Fate)                             (CC BY-SA 3.0)        (-)
     graphics/sprites/icons/poison.png (FotherJ)                             (CC BY-SA 3.0)        (-)
     graphics/sprites/icons/spell-protection.png (Reid)                      (CC BY-SA 3.0)        (Alige)
+    graphics/sprites/icons/vomit.png (Micksha)                              (MIT)                 (-)
     graphics/sprites/icons/weapon-fire.png (Micksha)                        (CC BY-SA 4.0, GPLv3) (-)
     graphics/sprites/icons/weapon-water.png (Micksha)                       (CC BY-SA 4.0, GPLv3) (-)
     graphics/sprites/icons/weapon-nature.png (Micksha)                      (CC BY-SA 4.0, GPLv3) (-)
diff --git a/graphics/sprites/icons/drunk.png b/graphics/sprites/icons/drunk.png
new file mode 100644
index 00000000..476e8083
--- /dev/null
+++ b/graphics/sprites/icons/drunk.png
diff --git a/graphics/sprites/icons/drunk.xml b/graphics/sprites/icons/drunk.xml
new file mode 100644
index 00000000..ae1d6153
--- /dev/null
+++ b/graphics/sprites/icons/drunk.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2020 Evol Online -->
+
+<sprite>
+    <imageset name="icon"
+              src="graphics/sprites/icons/drunk.png"
+              width="16"
+              height="16"
+              offsetY="-12"/>
+
+    <action name="default" imageset="icon">
+        <animation direction="default">
+            <frame index="0"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/icons/vomit.png b/graphics/sprites/icons/vomit.png
new file mode 100644
index 00000000..6a8fa2d5
--- /dev/null
+++ b/graphics/sprites/icons/vomit.png
diff --git a/graphics/sprites/icons/vomit.xml b/graphics/sprites/icons/vomit.xml
new file mode 100644
index 00000000..1192043b
--- /dev/null
+++ b/graphics/sprites/icons/vomit.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2020 Evol Online -->
+
+<sprite>
+    <imageset name="icon"
+              src="graphics/sprites/icons/vomit.png"
+              width="16"
+              height="16"
+              offsetY="-14"/>
+    <action name="default" imageset="icon">
+        <animation direction="default">    
+            <label name="stand"/>
+            <goto label="static" rand="90"/>
+            <goto label="vomit" rand="100"/>
+            <!-- well... do nothing -->
+            <label name="static"/>
+                <frame index="0" delay="3000"/>
+            <goto label="stand"/>
+            <!-- vomiting -->
+            <label name="vomit"/>
+                <frame index="0" delay="140"/>
+                <frame index="1" delay="140"/>
+                <frame index="2" delay="120"/>
+                <frame index="3" delay="100"/>
+            <goto label="stand"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/items.xml b/items.xml
index b1a30a00..ec36eb8e 100644
--- a/items.xml
+++ b/items.xml
@@ -472,7 +472,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="usable/wine.png"
         name="Red Plush Wine"
         description="Wine produced from black grapes in the south-east of Aurora."
-        effect="Heal 40-90 HP"
+        effect="Confusion"
         useButton="Drink"
         type="usable"
         weight="10"/>
@@ -571,7 +571,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         name="Beer"
         useButton="Eat"
         description="Just a beer, nothing else. Don`t drink and drive!"
-        effect="Heal 400-500 HP"
+        effect="Confusion"
         type="usable"
         weight="50"
         maxFloorOffset="6"/>
diff --git a/status-effects.xml b/status-effects.xml
index c9543ff4..133b2e35 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -280,6 +280,11 @@ end-message:                Displays a message when the effect end.
 		start-message="You feel more protected."
 		end-message="You feel less protected."
     />
+    <status-effect
+        name="Confusion"
+        id="1151"
+        icon="icons/vomit.xml"
+    />
 
     <!-- OPTION_SIGHT -->
     <status-effect