fix wesnoth version

project-ethea · May 24, 2021 · 4363faf · 4363faf
1 parent 9fd246e
commit 4363faf
Show file tree

Hide file tree

Showing 3 changed files with 102 additions and 6 deletions.
diff --git a/episode3/scenarios/06_Divergence.cfg b/episode3/scenarios/06_Divergence.cfg
@@ -114,7 +114,11 @@
                 id=Irylean
                 [has_attack]
                     type=arcane
-                    special_type=poison
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=poison
+#else
+                    special_id=poison
+#endif
                 [/has_attack]
             [/have_unit]
             [then]

diff --git a/episode3/scenarios/07A_Dark_Fire_part_2.cfg b/episode3/scenarios/07A_Dark_Fire_part_2.cfg
@@ -502,7 +502,11 @@
             type=Boss Guardian of Darkness Elyssa
         [/filter_second]
         [filter_attack]
-            special_type=slow
+#ifver WESNOTH_VERSION < 1.15.2
+            special=slow
+#else
+            special_id=slow
+#endif
         [/filter_attack]
 
         [fire_event]

diff --git a/macros/weapon-specials-implementation.cfg b/macros/weapon-specials-implementation.cfg
@@ -6,7 +6,11 @@
         name=attacker hits
         first_time_only=no
         [filter_attack]
+#ifver WESNOTH_VERSION < 1.15.2
+            special=stun
+#else
             special_id=stun
+#endif
         [/filter_attack]
         [filter_second]
             [not]
@@ -93,7 +97,11 @@
         name=defender hits
         first_time_only=no
         [filter_second_attack]
+#ifver WESNOTH_VERSION < 1.15.2
+            special=seismic
+#else
             special_id=seismic
+#endif
         [/filter_second_attack]
 
         {EVENT_INVERSE_DISPATCH "seismic hits"}
@@ -126,7 +134,11 @@
         [filter]
             [not]
                 [has_attack]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=enemy_dazed
+#else
                     special_id=enemy_dazed
+#endif
                 [/has_attack]
             [/not]
         [/filter]
@@ -141,13 +153,25 @@
             [effect]
                 apply_to=attack
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=magical
+#else
                     special_id=magical
+#endif
                 [/not]
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=marksman
+#else
                     special_id=marksman
+#endif
                 [/not]
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=enemy_dazed
+#else
                     special_id=enemy_dazed
+#endif
                 [/not]
 
                 [set_specials]
@@ -170,12 +194,24 @@
             [/effect]
             [effect]
                 apply_to=attack
+#ifver WESNOTH_VERSION < 1.15.2
+                special=marksman
+#else
                 special_id=marksman
+#endif
                 [and]
-                    special_type=poison
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=poison
+#else
+                    special_id=poison
+#endif
                 [/and]
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=enemy_dazed
+#else
                     special_id=enemy_dazed
+#endif
                 [/not]
 
                 # Note: instead of simply appending, we have to use replace and
@@ -222,12 +258,24 @@
             [/effect]
             [effect]
                 apply_to=attack
+#ifver WESNOTH_VERSION < 1.15.2
+                special=marksman
+#else
                 special_id=marksman
+#endif
                 [not]
-                    special_type=poison
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=poison
+#else
+                    special_id=poison
+#endif
                 [/not]
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=enemy_dazed
+#else
                     special_id=enemy_dazed
+#endif
                 [/not]
 
                 # Note: instead of simply appending, we have to use replace and
@@ -280,7 +328,11 @@
         first_time_only=no
 
         [filter_attack]
+#ifver WESNOTH_VERSION < 1.15.2
+            special=daze
+#else
             special_id=daze
+#endif
         [/filter_attack]
 
         [filter_second]
@@ -313,13 +365,25 @@
             [effect]
                 apply_to=attack
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=magical
+#else
                     special_id=magical
+#endif
                 [/not]
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=marksman
+#else
                     special_id=marksman
+#endif
                 [/not]
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=self_dazed
+#else
                     special_id=self_dazed
+#endif
                 [/not]
 
                 [set_specials]
@@ -342,12 +406,24 @@
             [/effect]
             [effect]
                 apply_to=attack
+#ifver WESNOTH_VERSION < 1.15.2
+                special=marksman
+#else
                 special_id=marksman
+#endif
                 [and]
-                    special_type=poison
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=poison
+#else
+                    special_id=poison
+#endif
                 [/and]
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=self_dazed
+#else
                     special_id=self_dazed
+#endif
                 [/not]
 
                 [set_specials]
@@ -390,12 +466,24 @@
             [/effect]
             [effect]
                 apply_to=attack
+#ifver WESNOTH_VERSION < 1.15.2
+                special=marksman
+#else
                 special_id=marksman
+#endif
                 [not]
-                    special_type=poison
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=poison
+#else
+                    special_id=poison
+#endif
                 [/not]
                 [not]
+#ifver WESNOTH_VERSION < 1.15.2
+                    special=self_dazed
+#else
                     special_id=self_dazed
+#endif
                 [/not]
 
                 [set_specials]