summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaulc <lucashelaine14@gmail.com>2018-02-11 13:35:48 +0100
committerSaulc <lucashelaine14@gmail.com>2018-02-11 13:35:48 +0100
commit0f3375541a4332ff1ab8e4ee97e0e6b0f1ffec80 (patch)
tree5c1fd946adc5f766dfe1aa3e4c01f8d3bbe1b857
parent5aa68ac4e59e857611f6be257e05a41d3923f253 (diff)
parent49e731907a5377496d081be4f3366a4d4bdb36ca (diff)
downloadclientdata-0f3375541a4332ff1ab8e4ee97e0e6b0f1ffec80.tar.gz
clientdata-0f3375541a4332ff1ab8e4ee97e0e6b0f1ffec80.tar.bz2
clientdata-0f3375541a4332ff1ab8e4ee97e0e6b0f1ffec80.tar.xz
clientdata-0f3375541a4332ff1ab8e4ee97e0e6b0f1ffec80.zip
Merge branch 'master' of gitlab.com:TMW2/clientdata
-rw-r--r--graphics/sprites/hairstyles/hairstyle01.xml2
-rw-r--r--graphics/sprites/hairstyles/hairstyle13.xml2
-rw-r--r--graphics/sprites/races/human-male.xml8
-rw-r--r--items.xml20
4 files changed, 17 insertions, 15 deletions
diff --git a/graphics/sprites/hairstyles/hairstyle01.xml b/graphics/sprites/hairstyles/hairstyle01.xml
index 52fd83e4..354a2ecc 100644
--- a/graphics/sprites/hairstyles/hairstyle01.xml
+++ b/graphics/sprites/hairstyles/hairstyle01.xml
@@ -107,7 +107,7 @@ Copyright (C) 2012-2016 Evol Online -->
<action name="sit" imageset="base">
<animation direction="down">
- <frame index="0" offsetY="-22"/>
+ <frame index="0" offsetY="-17"/>
</animation>
<animation direction="left">
<frame index="1" offsetX="4" offsetY="-20"/>
diff --git a/graphics/sprites/hairstyles/hairstyle13.xml b/graphics/sprites/hairstyles/hairstyle13.xml
index caa00823..565a0793 100644
--- a/graphics/sprites/hairstyles/hairstyle13.xml
+++ b/graphics/sprites/hairstyles/hairstyle13.xml
@@ -110,7 +110,7 @@ Copyright (C) 2012 Evol Online -->
<action name="sit" imageset="base">
<animation direction="down">
- <frame index="0" offsetY="-26" offsetX="3"/>
+ <frame index="0" offsetY="-21" offsetX="3"/>
</animation>
<animation direction="left">
<frame index="3" offsetX="7" offsetY="-24"/>
diff --git a/graphics/sprites/races/human-male.xml b/graphics/sprites/races/human-male.xml
index 1f99a17e..9dfcd1d9 100644
--- a/graphics/sprites/races/human-male.xml
+++ b/graphics/sprites/races/human-male.xml
@@ -77,16 +77,16 @@ Copyright (C) 2012-2013 Evol Online -->
<action name="sit" imageset="base">
<animation direction="down">
- <frame index="68"/>
+ <frame index="64"/><!-- 68~71 are sit2 -->
</animation>
<animation direction="left">
- <frame index="69"/>
+ <frame index="65"/>
</animation>
<animation direction="up">
- <frame index="70"/>
+ <frame index="66"/>
</animation>
<animation direction="right">
- <frame index="71"/>
+ <frame index="67"/>
</animation>
</action>
diff --git a/items.xml b/items.xml
index 6531f7a1..013e4e79 100644
--- a/items.xml
+++ b/items.xml
@@ -285,6 +285,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
name="Croconut"
description="Fallen from a crocotree, this fruit could be opened."
useButton="Open"
+ effect="Inedible"
type="usable"
weight="80"/>
<item id="514"
@@ -400,6 +401,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
name="Iron Shovel"
useButton="Use"
description="Discover treasures, dungeons and raw materials."
+ effect="Dig holes"
type="usable"
weight="210"
maxFloorOffset="5"/>
@@ -867,7 +869,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<item id="585"
image="usable/cavesnakeegg.png"
name="Cave Snake Egg"
- description="."
+ description="For omelettes."
useButton="Eat"
effect="Heal 1000-5000 HP"
type="usable"
@@ -1623,7 +1625,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<item id="808"
image="generic/powder.png"
name="Powder"
- description=""
+ description="It will either bake a cake, or send your house though airs."
type="generic"
weight="1"
maxFloorOffset="20"/>
@@ -1770,35 +1772,35 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
<item id="829"
image="generic/butterfly.png"
name="Butterfly"
- description=""
+ description="It's made of butter! It flies! It is a BUTTERFLY!"
type="generic"
weight="1"
maxFloorOffset="20"/>
<item id="830"
image="generic/cavesnaketongue.png"
name="Cave Snake Tongue"
- description=""
+ description="It is not kind to show tongues to people, you know."
type="generic"
weight="1"
maxFloorOffset="20"/>
<item id="831"
image="generic/redscorpionstinger.png"
name="Red Scorpion Stinger"
- description=""
+ description="It stings!"
type="generic"
weight="1"
maxFloorOffset="20"/>
<item id="832"
image="generic/blackscorpionstinger.png"
name="Black Scorpion Stinger"
- description=""
+ description="It stings!"
type="generic"
weight="1"
maxFloorOffset="20"/>
<item id="833"
image="generic/emptybottle.png"
name="Empty Bottle"
- description=""
+ description="If you are thristy, this won't solve your problems."
type="generic"
weight="5"
maxFloorOffset="20"/>
@@ -1849,7 +1851,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
</item>
<item id="1005"
image="equipment/amulet/jacksskeletoncharm.png"
- name="Jack’s Skeleton Charm"
+ name="Jack's Skeleton Charm"
description="A mysterious charm said to only work at a special time of year."
level="60"
type="equip-necklace"
@@ -3825,7 +3827,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
image="equipment/weapons/trainingbow.png"
name="Training Bow"
description="Primarily used in training "
- attack="=20"
+ attack="20"
attack-range="5"
missile-particle="graphics/particles/training-arrow.xml"
missile-z="32"