Use ambush definitions from EoMa

ProditorMagnus · Dec 6, 2024 · dd395f2 · dd395f2
1 parent e70bf1e
commit dd395f2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 97 deletions.
diff --git a/data/BMR_data/rockhide.cfg b/data/BMR_data/rockhide.cfg
@@ -0,0 +1,6 @@
+#textdomain wensoth-Ageless_Era
+
+#define AE_ARCHAIC_ABILITY_ROCKHIDE
+    {ABILITY_AE_MAG_MOUNTAINAMBUSH}
+    {ABILITY_AE_CAVEAMBUSH}
+#enddef
diff --git a/data/general_data/abilities/cave_ambush.cfg b/data/general_data/abilities/cave_ambush.cfg
@@ -1,29 +1,5 @@
 #textdomain wesnoth-Ageless_Era
 
-# TODO check all ambush variations https://github.com/inferno8/wesnoth-Era_of_Magic/issues/70
-# EE
-
 #define ABILITY_AE_CAVEAMBUSH
-    [hides]
-        id=caveambush
-        name= _ "cave ambush"
-        special_note={SPECIAL_NOTES_CAVESTALK}
-        description=_"This unit can hide in cave, and remain undetected by its enemies.
-
-Enemy units cannot see this unit while it is in cave, except if they have units next to it. Any enemy unit that first discovers this unit immediately loses all its remaining movement."
-        affect_self=yes
-        [filter]
-            # all non lit cave terrains :
-            # - caves,
-            # - rockbound caves,
-            # - underground mushroom forest
-            # - allowing cave bridges may mean that units can move unseen through keypoints. maybe to strong.
-            [filter_location]
-                terrain=U*^*,*^Bs|,*^Bs/,*^Bs\
-                [not]
-                    terrain=*^Ii*,*^Ufi*,*^Bsb*,*^Bc*,*^Bh*,*^Bp*,*^Bw*,*^V*,*^Ecf
-                [/not]
-            [/filter_location]
-        [/filter]
-    [/hides]
+    {ABILITY_AE_MAG_CAVEAMBUSH}
 #enddef
diff --git a/data/general_data/abilities/mountain_ambush.cfg b/data/general_data/abilities/mountain_ambush.cfg
diff --git a/data/general_data/abilities/swamp_ambush.cfg b/data/general_data/abilities/swamp_ambush.cfg
@@ -3,28 +3,7 @@
 # EoMa, EFM, ME, EoS
 
 #define ABILITY_AE_SWAMPAMBUSH
-    [hides]
-        id=swampambush
-        name= _ "swamp prowl"
-        special_note={SPECIAL_NOTES_SWAMP_PROWL}
-        description=_"This unit can hide in swamp, and remain undetected by its enemies.
-
-Enemy units cannot see this unit while it is in swamp, except if they have units next to it. Any enemy unit that first discovers this unit immediately loses all its remaining movement."
-        affect_self=yes
-        [filter]
-            [filter_location]
-                terrain=S*^*,Chs*^*
-                [not]
-                    # if this ability is to weak, do not anymore disallow bridges in swamps
-                    terrain=*^B*,*^V*
-                [/not]
-            [/filter_location]
-        [/filter]
-    [/hides]
-#enddef
-
-#define ABILITY_AE_MAG_SWAMPAMBUSH
-    {ABILITY_AE_SWAMPAMBUSH}
+    {ABILITY_AE_MAG_SWAMPAMBUSH}
 #enddef
 
 #define AE_ARCHAIC_ABILITY_AQUALUNG

diff --git a/data/general_data/abilities/water_ambush.cfg b/data/general_data/abilities/water_ambush.cfg
@@ -3,27 +3,7 @@
 # EoMa, EotF
 
 #define ABILITY_AE_WATERAMBUSH
-    [hides]
-        id=waterambush
-        name= _ "shallow submerge"
-        special_note={SPECIAL_NOTES_SHALLOWSUB}
-        description=_"This unit can hide in water, and remain undetected by its enemies.
-
-Enemy units cannot see this unit while it is in water, except if they have units next to it. Any enemy unit that first discovers this unit immediately loses all its remaining movement."
-        affect_self=yes
-        [filter]
-            [filter_location]
-                terrain=W*^*,Chw*^*,Cm*^*,Km*^*
-                [not]
-                    terrain=Wwr*^*,Wwf^*,*^B*,*^V*,Kme*^*
-                [/not]
-            [/filter_location]
-        [/filter]
-    [/hides]
-#enddef
-
-#define ABILITY_AE_MAG_WATERAMBUSH
-    {ABILITY_AE_WATERAMBUSH}
+    {ABILITY_AE_MAG_WATERAMBUSH}
 #enddef
 
 #define AE_STEELHIVE_SUBMERGE