summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgraphics/particles/monster-reaper.particle.xml2
-rw-r--r--items.xml4
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
diff --git a/items.xml b/items.xml
index 4c37f43b..bdc04e5c 100644
--- a/items.xml
+++ b/items.xml
@@ -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"