summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-10-21 07:34:37 -0500
committerWushin <pasekei@gmail.com>2014-10-21 07:34:37 -0500
commita36926cf8d2d4568e4141b41df80dc632428c9d2 (patch)
tree230b57debcdf1d26c50ae42d8dfb2332027f6296
parentd215fd9ab4e0fad094fb43f7abfd6521d27d5543 (diff)
parentc9089d3bffd493cc95a529fdd5af8221c0f7f7b2 (diff)
downloadclientdata-a36926cf8d2d4568e4141b41df80dc632428c9d2.tar.gz
clientdata-a36926cf8d2d4568e4141b41df80dc632428c9d2.tar.bz2
clientdata-a36926cf8d2d4568e4141b41df80dc632428c9d2.tar.xz
clientdata-a36926cf8d2d4568e4141b41df80dc632428c9d2.zip
Merge pull request #176 from mekolat/skeleton-charm
fix skeleton charm
-rw-r--r--items/equip-2hand/item906_KidBook.xml2
-rw-r--r--items/equip-charm/item1197_JacksSkeletonCharm.xml6
-rw-r--r--items/racesprite/_include.xml3
-rw-r--r--items/racesprite/item-198_Skeleton.xml12
-rw-r--r--items/racesprite/item-199_Troll.xml (renamed from items/racesprite/item-110_Troll.xml)2
5 files changed, 20 insertions, 5 deletions
diff --git a/items/equip-2hand/item906_KidBook.xml b/items/equip-2hand/item906_KidBook.xml
index 5b825982..286bfb75 100644
--- a/items/equip-2hand/item906_KidBook.xml
+++ b/items/equip-2hand/item906_KidBook.xml
@@ -9,7 +9,7 @@
<item id="906" image="equipment/weapon/kidbook.png" name="Kid Book" description="A big spell book used to transform humans into Trolls." effect="Damage +1" type="equip-2hand" weight="100" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" sellProtected="true">
<replace/>
<replace sprite="race">
- <item from="-100" to="-110"/>
+ <item to="-199"/>
</replace>
</item>
</items>
diff --git a/items/equip-charm/item1197_JacksSkeletonCharm.xml b/items/equip-charm/item1197_JacksSkeletonCharm.xml
index f7536f7d..3c5bb831 100644
--- a/items/equip-charm/item1197_JacksSkeletonCharm.xml
+++ b/items/equip-charm/item1197_JacksSkeletonCharm.xml
@@ -6,7 +6,9 @@
<its:translateRule selector="//item/@effect" translate="yes"/>
<its:translateRule selector="//*" translate="no"/>
</its:rules>
- <item id="1197" image="equipment/charms/skeletoncharm.png" name="Jack's Skeleton Charm" description="A mysterious charm said to only work at a special time of year" type="equip-charm" weight="10" sellProtected="true" drawBefore="boots">
- <sprite>monsters/skeleton.xml</sprite>
+ <item id="1197" image="equipment/charms/skeletoncharm.png" name="Jack's Skeleton Charm" description="A mysterious charm said to only work at a special time of year" type="equip-charm" weight="10" sellProtected="true">
+ <replace sprite="race">
+ <item to="-198"/>
+ </replace>
</item>
</items>
diff --git a/items/racesprite/_include.xml b/items/racesprite/_include.xml
index f1830b4f..9fa776c7 100644
--- a/items/racesprite/_include.xml
+++ b/items/racesprite/_include.xml
@@ -7,5 +7,6 @@
<its:translateRule selector="//*" translate="no"/>
</its:rules>
<include name="items/racesprite/item-100_Human.xml"/>
- <include name="items/racesprite/item-110_Troll.xml"/>
+ <include name="items/racesprite/item-198_Skeleton.xml"/>
+ <include name="items/racesprite/item-199_Troll.xml"/>
</items>
diff --git a/items/racesprite/item-198_Skeleton.xml b/items/racesprite/item-198_Skeleton.xml
new file mode 100644
index 00000000..260347bf
--- /dev/null
+++ b/items/racesprite/item-198_Skeleton.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+ <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+ <its:translateRule selector="//item/@name" translate="yes"/>
+ <its:translateRule selector="//item/@description" translate="yes"/>
+ <its:translateRule selector="//item/@effect" translate="yes"/>
+ <its:translateRule selector="//*" translate="no"/>
+ </its:rules>
+ <item id="-198" type="racesprite" name="Skeleton">
+ <sprite>monsters/skeleton.xml|#ffe8bf</sprite>
+ </item>
+</items>
diff --git a/items/racesprite/item-110_Troll.xml b/items/racesprite/item-199_Troll.xml
index 732f9e61..90b4ede7 100644
--- a/items/racesprite/item-110_Troll.xml
+++ b/items/racesprite/item-199_Troll.xml
@@ -6,7 +6,7 @@
<its:translateRule selector="//item/@effect" translate="yes"/>
<its:translateRule selector="//*" translate="no"/>
</its:rules>
- <item id="-110" type="racesprite" name="Troll">
+ <item id="-199" type="racesprite" name="Troll">
<sprite>monsters/troll-race.xml|#FFDEC2;#FF4D4D;#FF99FF;#FFC88A</sprite>
</item>
</items>