diff options
author | nmaligec <wouldnot@hotmail.com> | 2011-01-05 05:28:04 -0500 |
---|---|---|
committer | nmaligec <wouldnot@hotmail.com> | 2011-01-05 05:28:04 -0500 |
commit | 1a78870bcf89cf9336f6a758f94afd5ce79b5040 (patch) | |
tree | 139f9a865b7da14543528a355de54176b389d847 | |
parent | ff1acc14dcc3683aad70907c3748f3f8faf552dc (diff) | |
download | clientdata-1a78870bcf89cf9336f6a758f94afd5ce79b5040.tar.gz clientdata-1a78870bcf89cf9336f6a758f94afd5ce79b5040.tar.bz2 clientdata-1a78870bcf89cf9336f6a758f94afd5ce79b5040.tar.xz clientdata-1a78870bcf89cf9336f6a758f94afd5ce79b5040.zip |
quick fixes
-rwxr-xr-x | graphics/particles/monster-reaper.particle.xml | 2 | ||||
-rw-r--r-- | items.xml | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/graphics/particles/monster-reaper.particle.xml b/graphics/particles/monster-reaper.particle.xml index ed00b360..967dc686 100755 --- a/graphics/particles/monster-reaper.particle.xml +++ b/graphics/particles/monster-reaper.particle.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?>
<!--
-Orange-ish particles that fly up to the sky; based on Crush's Soul Menhir effect.
+Purple-ish ghost faces rise up from the ground
-->
<effect>
<particle
@@ -1050,11 +1050,7 @@ image="weapon-polearm-spear.png" name="Spear" description="A light spear with a wooden pole." -<<<<<<< HEAD effect="+40 Damage, 1 Range" -======= - effect="+50 Damage" ->>>>>>> c9008a1f4b6b7616056fb593dad2e5a32589f596 type="equip-2hand" weapon_type="11" weapon-type="polearm" |