From 77ac2bc8bb7424b289774603cea271d840dbc77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Timbert?= <benoit.timbert@free.fr>
Date: Sun, 23 Sep 2007 17:16:13 +0000
Subject: [PATCH] Fix a few broken attack filters for the Hunter, Spearman and
 Javelineer

---
 data/core/units/merfolk/Hunter.cfg     | 5 +++++
 data/core/units/merfolk/Javelineer.cfg | 7 ++++++-
 data/core/units/merfolk/Spearman.cfg   | 5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/data/core/units/merfolk/Hunter.cfg b/data/core/units/merfolk/Hunter.cfg
index 5457773afaf..b29e6b1fc80 100644
--- a/data/core/units/merfolk/Hunter.cfg
+++ b/data/core/units/merfolk/Hunter.cfg
@@ -38,6 +38,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+	    range=ranged
         [/attack_filter]
         [missile_frame]
             begin=-150
@@ -72,6 +73,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=s
         [frame]
@@ -116,6 +118,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=n
         [frame]
@@ -160,6 +163,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=ne,nw
         [frame]
@@ -194,6 +198,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=se,sw
         [frame]
diff --git a/data/core/units/merfolk/Javelineer.cfg b/data/core/units/merfolk/Javelineer.cfg
index 86ff5d24390..8b6d19d3073 100644
--- a/data/core/units/merfolk/Javelineer.cfg
+++ b/data/core/units/merfolk/Javelineer.cfg
@@ -38,6 +38,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+	    range=ranged
         [/attack_filter]
         [missile_frame]
             begin=-150
@@ -72,7 +73,8 @@
     [attack_anim]
         [attack_filter]
             name=spear
-        [/attack_filter]
+            range=melee
+       [/attack_filter]
         direction=s
         [frame]
             begin=-200
@@ -106,6 +108,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=n
         [frame]
@@ -140,6 +143,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=ne,nw
         [frame]
@@ -174,6 +178,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=se,sw
         [frame]
diff --git a/data/core/units/merfolk/Spearman.cfg b/data/core/units/merfolk/Spearman.cfg
index 0e7e2539161..90a8c58bada 100644
--- a/data/core/units/merfolk/Spearman.cfg
+++ b/data/core/units/merfolk/Spearman.cfg
@@ -37,6 +37,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+	    range=ranged
         [/attack_filter]
         [missile_frame]
             begin=-150
@@ -71,6 +72,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=s
         [frame]
@@ -115,6 +117,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=n
         [frame]
@@ -159,6 +162,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=ne,nw
         [frame]
@@ -193,6 +197,7 @@
     [attack_anim]
         [attack_filter]
             name=spear
+            range=melee
         [/attack_filter]
         direction=se,sw
         [frame]