From 1606bb72cef2c2bde02ec3f2227c7b5d138ada91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Severin=20Gl=C3=B6ckner?=
 <severin.gloeckner@stud.htwk-leipzig.de>
Date: Wed, 12 Oct 2016 15:15:09 +0200
Subject: [PATCH] Made Drake Flying Animations working on more terrains. E.g.
 they weren't working on water with water lilies before. The terrain codes are
 now more generic too, for the case somebody wants to make an UMC variation.

Also had a look on other places where terrain codes get used.
---
 data/core/macros/animation-utils.cfg    | 2 +-
 data/core/units/goblins/Wolf_Rider.cfg  | 2 +-
 data/core/units/monsters/Wolf.cfg       | 2 +-
 data/core/units/saurians/Skirmisher.cfg | 8 +-------
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/data/core/macros/animation-utils.cfg b/data/core/macros/animation-utils.cfg
index 86e467c9b975..e2a688956cc9 100644
--- a/data/core/macros/animation-utils.cfg
+++ b/data/core/macros/animation-utils.cfg
@@ -775,7 +775,7 @@
 #enddef
 
 #define DRAKE_UNWALKABLE_TERRAINS
-!,Wwf,*^B*,!,W*,W*^V*,Chs,Chw,S*,S*^V*,Q*,Mv#enddef
+!,Wwf*^*,Kme*^*,*^B*,!,W*^*,S*^*,Chs*^*,Chw*^*,Cm*^*,Km*^*,Q*^*,Mv*^*,*^Qov,*^Vm,*^Vhs#enddef
 
 #define DRAKE_STANDING_ANIM DRAKE_NAME
     [standing_anim]
diff --git a/data/core/units/goblins/Wolf_Rider.cfg b/data/core/units/goblins/Wolf_Rider.cfg
index 7579db2dd96e..faaeb49ae41b 100644
--- a/data/core/units/goblins/Wolf_Rider.cfg
+++ b/data/core/units/goblins/Wolf_Rider.cfg
@@ -13,7 +13,7 @@
     [/standing_anim]
     [standing_anim]
         start_time=-50
-        terrain_type=!,*^B*,!,Chs^*,Chw^*,W*^*,S*^*,*^Vm
+        terrain_type=!,*^B*,!,Chs*^*,Chw*^*,W*^*,S*^*,*^Vm,*^Vhs
         [frame]
             image="units/goblins/wolf-rider-water.png:50"
         [/frame]
diff --git a/data/core/units/monsters/Wolf.cfg b/data/core/units/monsters/Wolf.cfg
index 9206a26d4526..c129c65b2445 100644
--- a/data/core/units/monsters/Wolf.cfg
+++ b/data/core/units/monsters/Wolf.cfg
@@ -14,7 +14,7 @@
     [/standing_anim]
     [standing_anim]
         start_time=-50
-        terrain_type=!,*^B*,!,Chs^*,Chw^*,W*^*,S*^*,*^Vm
+        terrain_type=!,*^B*,!,Chs*^*,Chw*^*,W*^*,S*^*,*^Vm,*^Vhs
         [frame]
             image="units/monsters/wolf-water.png"
             duration=50
diff --git a/data/core/units/saurians/Skirmisher.cfg b/data/core/units/saurians/Skirmisher.cfg
index a40df5489ada..f37d60d0c80c 100644
--- a/data/core/units/saurians/Skirmisher.cfg
+++ b/data/core/units/saurians/Skirmisher.cfg
@@ -23,13 +23,7 @@ Spears are their preferred weapon, as their powerful hind legs can drive a spear
     [/abilities]
     [idle_anim]
         {STANDARD_IDLE_FILTER}
-        [filter]
-            [filter_location]
-                [not]
-                    terrain=C*,K*,*^V*
-                [/not]
-            [/filter_location]
-        [/filter]
+        terrain_type=!,C*^*,K*^*,*^V*
         start_time=0
         [frame]
             image="units/saurians/skirmisher/skirmisher-idle-[1~7,6,5,6,8~13].png:200,units/saurians/skirmisher/skirmisher-idle-[12,13,12,13].png:[225*2,250*2]"