Refactored some of the NEW:WALL* macros

This adds optional arguments to NEW:WALL and NEW:WALL2 and makes them the "parent" macros instead of NEW:WALL_PL and NEW:WALL2_P, which are now kept only for compatibility.
wesnoth · Mar 15, 2017 · 515244d · 515244d
1 parent cd53177
commit 515244d
Showing 1 changed file with 42 additions and 22 deletions.
diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg
@@ -1058,7 +1058,17 @@ transition#endarg
     [/terrain_graphics]
 #enddef
 
-#define NEW:WALL_PL TERRAINLIST ADJACENT PROB LAYER IMAGESTEM
+#define NEW:WALL TERRAINLIST ADJACENT IMAGESTEM
+
+#arg PROB
+100#endarg
+
+#arg LAYER
+0#endarg
+
+#arg FLAG
+wall#endarg
+
     [terrain_graphics]
         map="
 2
@@ -1067,17 +1077,17 @@ transition#endarg
         [tile]
             pos=1
             type={TERRAINLIST}
-            set_no_flag=wall-@R0
+            set_no_flag={FLAG}-@R0
         [/tile]
         [tile]
             pos=2
             type={ADJACENT}
-            set_no_flag=wall-@R2
+            set_no_flag={FLAG}-@R2
         [/tile]
         [tile]
             pos=3
             type={ADJACENT}
-            set_no_flag=wall-@R4
+            set_no_flag={FLAG}-@R4
         [/tile]
 
         rotations=tr,r,br,bl,l,tl
@@ -1099,17 +1109,17 @@ transition#endarg
         [tile]
             pos=1
             type={ADJACENT}
-            set_no_flag=wall-@R0
+            set_no_flag={FLAG}-@R0
         [/tile]
         [tile]
             pos=2
             type={TERRAINLIST}
-            set_no_flag=wall-@R2
+            set_no_flag={FLAG}-@R2
         [/tile]
         [tile]
             pos=3
             type={TERRAINLIST}
-            set_no_flag=wall-@R4
+            set_no_flag={FLAG}-@R4
         [/tile]
 
         rotations=tr,r,br,bl,l,tl
@@ -1124,12 +1134,22 @@ transition#endarg
     [/terrain_graphics]
 #enddef
 
-#define NEW:WALL TERRAINLIST ADJACENT IMAGESTEM
-    {NEW:WALL_PL {TERRAINLIST} {ADJACENT} 100 0 {IMAGESTEM}}
+#define NEW:WALL_PL TERRAINLIST ADJACENT PROB LAYER IMAGESTEM
+    {NEW:WALL {TERRAINLIST} {ADJACENT1} {IMAGESTEM} PROB={PROB} LAYER={LAYER}}
 #enddef
 
-#define NEW:WALL2_P TERRAINLIST ADJACENT1 ADJACENT2 PROB LAYER IMAGESTEM
-    {NEW:WALL_PL {TERRAINLIST} {ADJACENT1} {PROB} {LAYER} {IMAGESTEM}}
+#define NEW:WALL2 TERRAINLIST ADJACENT1 ADJACENT2 IMAGESTEM
+
+#arg PROB
+100#endarg
+
+#arg LAYER
+0#endarg
+
+#arg FLAG
+wall#endarg
+
+    {NEW:WALL {TERRAINLIST} {ADJACENT1} {IMAGESTEM} PROB={PROB} LAYER={LAYER}}
 
     [terrain_graphics]
         map="
@@ -1139,24 +1159,24 @@ transition#endarg
         [tile]
             pos=1
             type={TERRAINLIST}
-            set_no_flag=wall-@R0
+            set_no_flag={FLAG}-@R0
         [/tile]
         [tile]
             pos=2
             type={ADJACENT1}
-            set_no_flag=wall-@R2
+            set_no_flag={FLAG}-@R2
         [/tile]
         [tile]
             pos=3
             type={ADJACENT2}
-            set_no_flag=wall-@R4
+            set_no_flag={FLAG}-@R4
         [/tile]
 
         rotations=tr,r,br,bl,l,tl
         probability={PROB}
 
         [image]
-            layer=0
+            layer={LAYER}
             base=54,72
             name={IMAGESTEM}@V-cw-@R0.png
             variations=";2;3;4;5;6"
@@ -1171,37 +1191,37 @@ transition#endarg
         [tile]
             pos=1
             type={TERRAINLIST}
-            set_no_flag=wall-@R0
+            set_no_flag={FLAG}-@R0
         [/tile]
         [tile]
             pos=2
             type={ADJACENT2}
-            set_no_flag=wall-@R2
+            set_no_flag={FLAG}-@R2
         [/tile]
         [tile]
             pos=3
             type={ADJACENT1}
-            set_no_flag=wall-@R4
+            set_no_flag={FLAG}-@R4
         [/tile]
 
         rotations=tr,r,br,bl,l,tl
         probability={PROB}
 
         [image]
-            layer=0
+            layer={LAYER}
             base=54,72
             name={IMAGESTEM}@V-ccw-@R0.png
             variations=";2;3;4;5;6"
         [/image]
     [/terrain_graphics]
 #enddef
 
-#define NEW:WALL2 TERRAINLIST ADJACENT1 ADJACENT2 IMAGESTEM
-    {NEW:WALL2_P {TERRAINLIST} {ADJACENT1} {ADJACENT2} 100 0 {IMAGESTEM}}
+#define NEW:WALL2_P TERRAINLIST ADJACENT1 ADJACENT2 PROB LAYER IMAGESTEM
+    {NEW:WALL2 {TERRAINLIST} {ADJACENT1} {ADJACENT2} {IMAGESTEM} PROB={PROB} LAYER={LAYER}}
 #enddef
 
 #define NEW:WALL2_L TERRAINLIST ADJACENT1 ADJACENT2 LAYER IMAGESTEM
-    {NEW:WALL2_P {TERRAINLIST} {ADJACENT1} {ADJACENT2} 100 {LAYER} {IMAGESTEM}}
+    {NEW:WALL2 {TERRAINLIST} {ADJACENT1} {ADJACENT2} {IMAGESTEM} LAYER={LAYER}}
 #enddef
 
 #define NEW:CASTLEWALL_INTERNAL_P TERRAINLIST ADJACENT PROB IMAGESTEM