Re-enable macro argument type checking, and fix some glitches it turns up.
Most changes in this diff just rename macro formal args so they match what the type checker expects.
This commit is contained in:
Eric S. Raymond
parent
74e545f178
commit
1f1fc2164f
12 changed files with 375 additions and 372 deletions
|
|
@ -9,11 +9,11 @@ This unit negates enemy Zones of Control around itself for friendly units (but n
|
|||
affect_self=no
|
||||
[affect_adjacent]
|
||||
adjacent=n,ne,se,s,sw,nw
|
||||
[filter]
|
||||
[not]
|
||||
type={TYPE}
|
||||
[/not]
|
||||
[/filter]
|
||||
#[filter]
|
||||
# [not]
|
||||
# type={TYPE}
|
||||
# [/not]
|
||||
#[/filter]
|
||||
[/affect_adjacent]
|
||||
[/skirmisher]
|
||||
#enddef
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker=narrator
|
||||
image="human-loyalists/bowman-ranged-7.png~RC(magenta>red)"
|
||||
image="human-loyalists/bowman-bow.png~RC(magenta>red)"
|
||||
message= _ "Bowmen have a strong ranged attack, and are very effective against units that lack a ranged attack, like Thieves and Thugs. They also carry a sword and can defend themselves against melee attacks."
|
||||
[/message]
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ Gg , Gg , Gg , Gg
|
|||
[message]
|
||||
speaker=narrator
|
||||
message= _ "The computer player might not be able to play side $side_number properly in this scenario. Side $side_number is intended to be played by a human player."
|
||||
image=icons/icon-ai.png
|
||||
image=images/wesnoth-icon.png
|
||||
[/message]
|
||||
|
||||
[set_variable]
|
||||
|
|
|
|||
|
|
@ -1,133 +1,133 @@
|
|||
#textdomain wesnoth
|
||||
|
||||
#define WALL_TRANSITION_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}-convex}
|
||||
{CORNER_OVERLAY_PLF ({ADJACENT}) ({TERRAIN}) ({TERRAIN}) {PROB} {LAYER} {FLAG} {IMAGE}-concave}
|
||||
#define WALL_TRANSITION_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN}) ({ADJACENT}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-convex}
|
||||
{CORNER_OVERLAY_PLF ({ADJACENT}) ({TERRAIN}) ({TERRAIN}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-concave}
|
||||
#enddef
|
||||
|
||||
#meta-macro WALL_TRANSITION TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#meta-macro WALL_TRANSITION TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
|
||||
#define WALL_TRANSITION2_PLF TERRAIN1 TERRAIN2 ADJACENT PROB LAYER FLAG IMAGE
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGE}-convex}
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN2}) ({TERRAIN1}) ({TERRAIN1}) {PROB} {LAYER} {FLAG} {IMAGE}-concave}
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}-cw}
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({ADJACENT}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGE}-ccw}
|
||||
#define WALL_TRANSITION2_PLF TERRAIN1 TERRAIN2 ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-convex}
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN2}) ({TERRAIN1}) ({TERRAIN1}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-concave}
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-cw}
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({ADJACENT}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-ccw}
|
||||
#enddef
|
||||
|
||||
#meta-macro WALL_TRANSITION2 TERRAIN1 TERRAIN2 ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#meta-macro WALL_TRANSITION2 TERRAIN1 TERRAIN2 ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
|
||||
#define WALL_TRANSITION3_PLF TERRAIN1 TERRAIN2 TERRAIN3 PROB LAYER FLAG IMAGE
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) {PROB} {LAYER} {FLAG} {IMAGE}-cw}
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN3}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGE}-ccw}
|
||||
#define WALL_TRANSITION3_PLF TERRAIN1 TERRAIN2 TERRAIN3 PROB LAYER FLAG IMAGESTEM
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-cw}
|
||||
{CORNER_OVERLAY_PLF ({TERRAIN1}) ({TERRAIN3}) ({TERRAIN2}) {PROB} {LAYER} {FLAG} {IMAGESTEM}-ccw}
|
||||
#enddef
|
||||
|
||||
#meta-macro WALL_TRANSITION3 TERRAIN1 TERRAIN2 TERRAIN3 P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#meta-macro WALL_TRANSITION3 TERRAIN1 TERRAIN2 TERRAIN3 P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
|
||||
#define SIMPLE_OVERLAY_TERRAIN TERRAIN RESTRICTING IMAGE
|
||||
{OVERLAY_RESTRICTED3_P ({TERRAIN}) ({RESTRICTING}) 25 {IMAGE}-small-4}
|
||||
{OVERLAY_RESTRICTED3_P ({TERRAIN}) ({RESTRICTING}) 33 {IMAGE}-small-3}
|
||||
{OVERLAY_RESTRICTED3_P ({TERRAIN}) ({RESTRICTING}) 50 {IMAGE}-small-2}
|
||||
{OVERLAY_RESTRICTED3 ({TERRAIN}) ({RESTRICTING}) {IMAGE}-small}
|
||||
{TRANSITION_RESTRICTED2 ({TERRAIN}) ({RESTRICTING}) {IMAGE}}
|
||||
{OVERLAY_RESTRICTED2_P ({TERRAIN}) ({RESTRICTING}) 25 {IMAGE}-small-4}
|
||||
{OVERLAY_RESTRICTED2_P ({TERRAIN}) ({RESTRICTING}) 33 {IMAGE}-small-3}
|
||||
{OVERLAY_RESTRICTED2_P ({TERRAIN}) ({RESTRICTING}) 50 {IMAGE}-small-2}
|
||||
{OVERLAY_RESTRICTED2 ({TERRAIN}) ({RESTRICTING}) {IMAGE}-small}
|
||||
{TRANSITION_RESTRICTED ({TERRAIN}) ({RESTRICTING}) {IMAGE}}
|
||||
{OVERLAY_RESTRICTED_P ({TERRAIN}) ({RESTRICTING}) 25 {IMAGE}-small-4}
|
||||
{OVERLAY_RESTRICTED_P ({TERRAIN}) ({RESTRICTING}) 33 {IMAGE}-small-3}
|
||||
{OVERLAY_RESTRICTED_P ({TERRAIN}) ({RESTRICTING}) 50 {IMAGE}-small-2}
|
||||
{OVERLAY_RESTRICTED ({TERRAIN}) ({RESTRICTING}) {IMAGE}-small}
|
||||
{OVERLAY_P ({TERRAIN}) 16 {IMAGE}-6}
|
||||
{OVERLAY_P ({TERRAIN}) 20 {IMAGE}-5}
|
||||
{OVERLAY_P ({TERRAIN}) 25 {IMAGE}-4}
|
||||
{OVERLAY_P ({TERRAIN}) 33 {IMAGE}-3}
|
||||
{OVERLAY_P ({TERRAIN}) 50 {IMAGE}-2}
|
||||
{OVERLAY ({TERRAIN}) {IMAGE}}
|
||||
#define SIMPLE_OVERLAY_TERRAIN TERRAINLIST RESTRICTING IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_P ({TERRAINLIST}) ({RESTRICTING}) 25 {IMAGESTEM}-small-4}
|
||||
{OVERLAY_RESTRICTED3_P ({TERRAINLIST}) ({RESTRICTING}) 33 {IMAGESTEM}-small-3}
|
||||
{OVERLAY_RESTRICTED3_P ({TERRAINLIST}) ({RESTRICTING}) 50 {IMAGESTEM}-small-2}
|
||||
{OVERLAY_RESTRICTED3 ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}-small}
|
||||
{TRANSITION_RESTRICTED2 ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}}
|
||||
{OVERLAY_RESTRICTED2_P ({TERRAINLIST}) ({RESTRICTING}) 25 {IMAGESTEM}-small-4}
|
||||
{OVERLAY_RESTRICTED2_P ({TERRAINLIST}) ({RESTRICTING}) 33 {IMAGESTEM}-small-3}
|
||||
{OVERLAY_RESTRICTED2_P ({TERRAINLIST}) ({RESTRICTING}) 50 {IMAGESTEM}-small-2}
|
||||
{OVERLAY_RESTRICTED2 ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}-small}
|
||||
{TRANSITION_RESTRICTED ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}}
|
||||
{OVERLAY_RESTRICTED_P ({TERRAINLIST}) ({RESTRICTING}) 25 {IMAGESTEM}-small-4}
|
||||
{OVERLAY_RESTRICTED_P ({TERRAINLIST}) ({RESTRICTING}) 33 {IMAGESTEM}-small-3}
|
||||
{OVERLAY_RESTRICTED_P ({TERRAINLIST}) ({RESTRICTING}) 50 {IMAGESTEM}-small-2}
|
||||
{OVERLAY_RESTRICTED ({TERRAINLIST}) ({RESTRICTING}) {IMAGESTEM}-small}
|
||||
{OVERLAY_P ({TERRAINLIST}) 16 {IMAGESTEM}-6}
|
||||
{OVERLAY_P ({TERRAINLIST}) 20 {IMAGESTEM}-5}
|
||||
{OVERLAY_P ({TERRAINLIST}) 25 {IMAGESTEM}-4}
|
||||
{OVERLAY_P ({TERRAINLIST}) 33 {IMAGESTEM}-3}
|
||||
{OVERLAY_P ({TERRAINLIST}) 50 {IMAGESTEM}-2}
|
||||
{OVERLAY ({TERRAINLIST}) {IMAGESTEM}}
|
||||
#enddef
|
||||
|
||||
#define VILLAGE_P TERRAIN PROB IMAGE
|
||||
{OVERLAY_PLF ({TERRAIN}) {PROB} 0 village {IMAGE} }
|
||||
#define VILLAGE_P TERRAIN PROB IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAIN}) {PROB} 0 village {IMAGESTEM} }
|
||||
#enddef
|
||||
|
||||
#define VILLAGE TERRAIN IMAGE
|
||||
{OVERLAY_PLF ({TERRAIN}) 100 0 village {IMAGE} }
|
||||
#define VILLAGE TERRAIN IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAIN}) 100 0 village {IMAGESTEM} }
|
||||
#enddef
|
||||
|
||||
|
||||
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro WALL_TRANSITION TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro WALL_TRANSITION TERRAINLIST ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define WALL_TRANSITION_LF TERRAIN ADJACENT LAYER FLAG IMAGE
|
||||
{WALL_TRANSITION_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION_LF TERRAINLIST ADJACENT LAYER FLAG IMAGESTEM
|
||||
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION_PF TERRAIN ADJACENT PROB FLAG IMAGE
|
||||
{WALL_TRANSITION_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION_PF TERRAINLIST ADJACENT PROB FLAG IMAGESTEM
|
||||
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION_F TERRAIN ADJACENT FLAG IMAGE
|
||||
{WALL_TRANSITION_PLF ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION_F TERRAINLIST ADJACENT FLAG IMAGESTEM
|
||||
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION_PL TERRAIN ADJACENT PROB LAYER IMAGE
|
||||
{WALL_TRANSITION_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION_PL TERRAINLIST ADJACENT PROB LAYER IMAGESTEM
|
||||
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION_L TERRAIN ADJACENT LAYER IMAGE
|
||||
{WALL_TRANSITION_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION_L TERRAINLIST ADJACENT LAYER IMAGESTEM
|
||||
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION_P TERRAIN ADJACENT PROB IMAGE
|
||||
{WALL_TRANSITION_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION_P TERRAINLIST ADJACENT PROB IMAGESTEM
|
||||
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION TERRAIN ADJACENT IMAGE
|
||||
{WALL_TRANSITION_PLF ({TERRAIN}) ({ADJACENT}) 100 0 overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION TERRAINLIST ADJACENT IMAGESTEM
|
||||
{WALL_TRANSITION_PLF ({TERRAINLIST}) ({ADJACENT}) 100 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro WALL_TRANSITION2 TERRAIN1 TERRAIN2 ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro WALL_TRANSITION2 TERRAINLIST1 TERRAINLIST2 ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define WALL_TRANSITION2_LF TERRAIN1 TERRAIN2 ADJACENT LAYER FLAG IMAGE
|
||||
{WALL_TRANSITION2_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION2_LF TERRAINLIST1 TERRAINLIST2 ADJACENT LAYER FLAG IMAGESTEM
|
||||
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION2_PF TERRAIN1 TERRAIN2 ADJACENT PROB FLAG IMAGE
|
||||
{WALL_TRANSITION2_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION2_PF TERRAINLIST1 TERRAINLIST2 ADJACENT PROB FLAG IMAGESTEM
|
||||
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION2_F TERRAIN1 TERRAIN2 ADJACENT FLAG IMAGE
|
||||
{WALL_TRANSITION2_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION2_F TERRAINLIST1 TERRAINLIST2 ADJACENT FLAG IMAGESTEM
|
||||
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION2_PL TERRAIN1 TERRAIN2 ADJACENT PROB LAYER IMAGE
|
||||
{WALL_TRANSITION2_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION2_PL TERRAINLIST1 TERRAINLIST2 ADJACENT PROB LAYER IMAGESTEM
|
||||
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION2_L TERRAIN1 TERRAIN2 ADJACENT LAYER IMAGE
|
||||
{WALL_TRANSITION2_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION2_L TERRAINLIST1 TERRAINLIST2 ADJACENT LAYER IMAGESTEM
|
||||
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION2_P TERRAIN1 TERRAIN2 ADJACENT PROB IMAGE
|
||||
{WALL_TRANSITION2_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION2_P TERRAINLIST1 TERRAINLIST2 ADJACENT PROB IMAGESTEM
|
||||
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION2 TERRAIN1 TERRAIN2 ADJACENT IMAGE
|
||||
{WALL_TRANSITION2_PLF ({TERRAIN1}) ({TERRAIN2}) ({ADJACENT}) 100 0 overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION2 TERRAINLIST1 TERRAINLIST2 ADJACENT IMAGESTEM
|
||||
{WALL_TRANSITION2_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({ADJACENT}) 100 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro WALL_TRANSITION3 TERRAIN1 TERRAIN2 TERRAIN3 P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro WALL_TRANSITION3 TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define WALL_TRANSITION3_LF TERRAIN1 TERRAIN2 TERRAIN3 LAYER FLAG IMAGE
|
||||
{WALL_TRANSITION3_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION3_LF TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 LAYER FLAG IMAGESTEM
|
||||
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION3_PF TERRAIN1 TERRAIN2 TERRAIN3 PROB FLAG IMAGE
|
||||
{WALL_TRANSITION3_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) ({PROB}) 0 ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION3_PF TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 PROB FLAG IMAGESTEM
|
||||
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION3_F TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
|
||||
{WALL_TRANSITION3_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) 100 0 ({FLAG}) ({IMAGE})}
|
||||
#define WALL_TRANSITION3_F TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 FLAG IMAGESTEM
|
||||
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) 100 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION3_PL TERRAIN1 TERRAIN2 TERRAIN3 PROB LAYER IMAGE
|
||||
{WALL_TRANSITION3_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) ({PROB}) ({LAYER}) overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION3_PL TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 PROB LAYER IMAGESTEM
|
||||
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION3_L TERRAIN1 TERRAIN2 TERRAIN3 LAYER IMAGE
|
||||
{WALL_TRANSITION3_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) 100 ({LAYER}) overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION3_L TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 LAYER IMAGESTEM
|
||||
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) 100 ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION3_P TERRAIN1 TERRAIN2 TERRAIN3 PROB IMAGE
|
||||
{WALL_TRANSITION3_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) ({PROB}) 0 overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION3_P TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 PROB IMAGESTEM
|
||||
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) ({PROB}) 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define WALL_TRANSITION3 TERRAIN1 TERRAIN2 TERRAIN3 IMAGE
|
||||
{WALL_TRANSITION3_PLF ({TERRAIN1}) ({TERRAIN2}) ({TERRAIN3}) 100 0 overlay ({IMAGE})}
|
||||
#define WALL_TRANSITION3 TERRAINLIST1 TERRAINLIST2 TERRAINLIST3 IMAGESTEM
|
||||
{WALL_TRANSITION3_PLF ({TERRAINLIST1}) ({TERRAINLIST2}) ({TERRAINLIST3}) 100 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#textdomain wesnoth
|
||||
#Macro for 4-Hex mountains
|
||||
#define MOUNTAINS_2x2 TERRAIN PROB FLAG IMAGE
|
||||
#define MOUNTAINS_2x2 TERRAIN PROB FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
., *, ., .
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_1
|
||||
name={IMAGESTEM}_1
|
||||
base=88,144
|
||||
[/image]
|
||||
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_2
|
||||
name={IMAGESTEM}_2
|
||||
base=142,108
|
||||
[/image]
|
||||
|
||||
|
|
@ -41,14 +41,14 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_3
|
||||
name={IMAGESTEM}_3
|
||||
base=196,144
|
||||
[/image]
|
||||
probability={PROB}
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define MOUNTAINS_2x4_NW_SE TERRAIN PROB FLAG IMAGE
|
||||
#define MOUNTAINS_2x4_NW_SE TERRAIN PROB FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
., *, ., .
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_1
|
||||
name={IMAGESTEM}_1
|
||||
base=88,144
|
||||
[/image]
|
||||
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_2
|
||||
name={IMAGESTEM}_2
|
||||
base=144,108
|
||||
[/image]
|
||||
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_3
|
||||
name={IMAGESTEM}_3
|
||||
base=196,144
|
||||
[/image]
|
||||
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_4
|
||||
name={IMAGESTEM}_4
|
||||
base=248,180
|
||||
[/image]
|
||||
|
||||
|
|
@ -111,14 +111,14 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_5
|
||||
name={IMAGESTEM}_5
|
||||
base=304,216
|
||||
[/image]
|
||||
probability={PROB}
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define MOUNTAINS_2x4_SW_NE TERRAIN PROB FLAG IMAGE
|
||||
#define MOUNTAINS_2x4_SW_NE TERRAIN PROB FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
., ., *, .
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_1
|
||||
name={IMAGESTEM}_1
|
||||
base=88,216
|
||||
[/image]
|
||||
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_2
|
||||
name={IMAGESTEM}_2
|
||||
base=144,180
|
||||
[/image]
|
||||
|
||||
|
|
@ -159,7 +159,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_3
|
||||
name={IMAGESTEM}_3
|
||||
base=196,144
|
||||
[/image]
|
||||
|
||||
|
|
@ -170,7 +170,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_4
|
||||
name={IMAGESTEM}_4
|
||||
base=248,108
|
||||
[/image]
|
||||
|
||||
|
|
@ -181,14 +181,14 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_5
|
||||
name={IMAGESTEM}_5
|
||||
base=304,144
|
||||
[/image]
|
||||
probability={PROB}
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define MOUNTAINS_1x3_NW_SE TERRAIN PROB FLAG IMAGE
|
||||
#define MOUNTAINS_1x3_NW_SE TERRAIN PROB FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
., ., ., .
|
||||
|
|
@ -207,7 +207,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_1
|
||||
name={IMAGESTEM}_1
|
||||
base=0,144
|
||||
[/image]
|
||||
|
||||
|
|
@ -218,7 +218,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_2
|
||||
name={IMAGESTEM}_2
|
||||
base=0,180
|
||||
[/image]
|
||||
|
||||
|
|
@ -229,7 +229,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_3
|
||||
name={IMAGESTEM}_3
|
||||
base=36,216
|
||||
[/image]
|
||||
|
||||
|
|
@ -237,7 +237,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define MOUNTAINS_1x3_SW_NE TERRAIN PROB FLAG IMAGE
|
||||
#define MOUNTAINS_1x3_SW_NE TERRAIN PROB FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
., ., ., .
|
||||
|
|
@ -256,7 +256,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_1
|
||||
name={IMAGESTEM}_1
|
||||
base=88,216
|
||||
[/image]
|
||||
|
||||
|
|
@ -267,7 +267,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_2
|
||||
name={IMAGESTEM}_2
|
||||
base=142,180
|
||||
[/image]
|
||||
|
||||
|
|
@ -278,7 +278,7 @@
|
|||
set_flag={FLAG}
|
||||
[/tile]
|
||||
[image]
|
||||
name={IMAGE}_3
|
||||
name={IMAGESTEM}_3
|
||||
base=196,144
|
||||
[/image]
|
||||
|
||||
|
|
@ -290,7 +290,7 @@
|
|||
# Macros for mountain peaks
|
||||
#
|
||||
|
||||
#define PEAKS_LARGE TERRAIN PROB FLAG IMAGE
|
||||
#define PEAKS_LARGE TERRAIN PROB FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
., .
|
||||
|
|
@ -313,7 +313,7 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
layer=2
|
||||
[/image]
|
||||
|
||||
|
|
@ -321,7 +321,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define PEAKS_1x2_SW_NE TERRAIN PROB FLAG IMAGE
|
||||
#define PEAKS_1x2_SW_NE TERRAIN PROB FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
., .
|
||||
|
|
@ -351,12 +351,12 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
name={IMAGE}_1
|
||||
name={IMAGESTEM}_1
|
||||
layer=1
|
||||
[/image]
|
||||
|
||||
[image]
|
||||
name={IMAGE}_2
|
||||
name={IMAGESTEM}_2
|
||||
layer=2
|
||||
[/image]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,60 +1,60 @@
|
|||
#textdomain wesnoth
|
||||
|
||||
#define OVERLAY_RANDOM_LF TYPE LAYER FLAG IMAGE
|
||||
{OVERLAY_PLF ({TYPE}) 11 {LAYER} {FLAG} {IMAGE}9}
|
||||
{OVERLAY_PLF ({TYPE}) 12 {LAYER} {FLAG} {IMAGE}8}
|
||||
{OVERLAY_PLF ({TYPE}) 14 {LAYER} {FLAG} {IMAGE}7}
|
||||
{OVERLAY_PLF ({TYPE}) 16 {LAYER} {FLAG} {IMAGE}6}
|
||||
{OVERLAY_PLF ({TYPE}) 20 {LAYER} {FLAG} {IMAGE}5}
|
||||
{OVERLAY_PLF ({TYPE}) 25 {LAYER} {FLAG} {IMAGE}4}
|
||||
{OVERLAY_PLF ({TYPE}) 33 {LAYER} {FLAG} {IMAGE}3}
|
||||
{OVERLAY_PLF ({TYPE}) 50 {LAYER} {FLAG} {IMAGE}2}
|
||||
{OVERLAY_PLF ({TYPE}) 100 {LAYER} {FLAG} {IMAGE}}
|
||||
#define OVERLAY_RANDOM_LF TERRAINLIST LAYER FLAG IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 11 {LAYER} {FLAG} {IMAGESTEM}9}
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 12 {LAYER} {FLAG} {IMAGESTEM}8}
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 14 {LAYER} {FLAG} {IMAGESTEM}7}
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 16 {LAYER} {FLAG} {IMAGESTEM}6}
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 20 {LAYER} {FLAG} {IMAGESTEM}5}
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 25 {LAYER} {FLAG} {IMAGESTEM}4}
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 33 {LAYER} {FLAG} {IMAGESTEM}3}
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 50 {LAYER} {FLAG} {IMAGESTEM}2}
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 100 {LAYER} {FLAG} {IMAGESTEM}}
|
||||
#enddef
|
||||
|
||||
#meta-macro OVERLAY_RANDOM TYPE L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#meta-macro OVERLAY_RANDOM TERRAIN L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
|
||||
#define VILLAGE_RANDOM TYPE IMAGE
|
||||
{OVERLAY_RANDOM_LF ({TYPE}) 0 village {IMAGE} }
|
||||
#define VILLAGE_RANDOM TERRAINLIST IMAGESTEM
|
||||
{OVERLAY_RANDOM_LF ({TERRAINLIST}) 0 village {IMAGESTEM} }
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_BASE_RANDOM_LF TYPE LAYER FLAG IMAGE
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 11 {LAYER} {FLAG} {IMAGE}9}
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 12 {LAYER} {FLAG} {IMAGE}8}
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 14 {LAYER} {FLAG} {IMAGE}7}
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 16 {LAYER} {FLAG} {IMAGE}6}
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 20 {LAYER} {FLAG} {IMAGE}5}
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 25 {LAYER} {FLAG} {IMAGE}4}
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 33 {LAYER} {FLAG} {IMAGE}3}
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 50 {LAYER} {FLAG} {IMAGE}2}
|
||||
{TERRAIN_BASE_PLF ({TYPE}) 100 {LAYER} {FLAG} {IMAGE}}
|
||||
#define TERRAIN_BASE_RANDOM_LF TERRAIN LAYER FLAG IMAGESTEM
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 11 {LAYER} {FLAG} {IMAGESTEM}9}
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 12 {LAYER} {FLAG} {IMAGESTEM}8}
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 14 {LAYER} {FLAG} {IMAGESTEM}7}
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 16 {LAYER} {FLAG} {IMAGESTEM}6}
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 20 {LAYER} {FLAG} {IMAGESTEM}5}
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 25 {LAYER} {FLAG} {IMAGESTEM}4}
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 33 {LAYER} {FLAG} {IMAGESTEM}3}
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 50 {LAYER} {FLAG} {IMAGESTEM}2}
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 100 {LAYER} {FLAG} {IMAGESTEM}}
|
||||
#enddef
|
||||
|
||||
#meta-macro TERRAIN_BASE_RANDOM TYPE L=LAYER=-1000 F=FLAG=base IMAGE
|
||||
#meta-macro TERRAIN_BASE_RANDOM TERRAINLIST L=LAYER=-1000 F=FLAG=base IMAGESTEM
|
||||
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro OVERLAY_RANDOM TYPE L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro OVERLAY_RANDOM TERRAIN L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define OVERLAY_RANDOM_F TYPE FLAG IMAGE
|
||||
{OVERLAY_RANDOM_LF ({TYPE}) 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RANDOM_F TERRAIN FLAG IMAGESTEM
|
||||
{OVERLAY_RANDOM_LF ({TERRAIN}) 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RANDOM_L TYPE LAYER IMAGE
|
||||
{OVERLAY_RANDOM_LF ({TYPE}) ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_RANDOM_L TERRAIN LAYER IMAGESTEM
|
||||
{OVERLAY_RANDOM_LF ({TERRAIN}) ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RANDOM TYPE IMAGE
|
||||
{OVERLAY_RANDOM_LF ({TYPE}) 0 overlay ({IMAGE})}
|
||||
#define OVERLAY_RANDOM TERRAIN IMAGESTEM
|
||||
{OVERLAY_RANDOM_LF ({TERRAIN}) 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro TERRAIN_BASE_RANDOM TYPE L=LAYER=-1000 F=FLAG=base IMAGE
|
||||
#generated from: #meta-macro TERRAIN_BASE_RANDOM TERRAINLIST L=LAYER=-1000 F=FLAG=base IMAGESTEM
|
||||
#Please do not modify
|
||||
#define TERRAIN_BASE_RANDOM_F TYPE FLAG IMAGE
|
||||
{TERRAIN_BASE_RANDOM_LF ({TYPE}) -1000 ({FLAG}) ({IMAGE})}
|
||||
#define TERRAIN_BASE_RANDOM_F TERRAINLIST FLAG IMAGESTEM
|
||||
{TERRAIN_BASE_RANDOM_LF ({TERRAINLIST}) -1000 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TERRAIN_BASE_RANDOM_L TYPE LAYER IMAGE
|
||||
{TERRAIN_BASE_RANDOM_LF ({TYPE}) ({LAYER}) base ({IMAGE})}
|
||||
#define TERRAIN_BASE_RANDOM_L TERRAINLIST LAYER IMAGESTEM
|
||||
{TERRAIN_BASE_RANDOM_LF ({TERRAINLIST}) ({LAYER}) base ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TERRAIN_BASE_RANDOM TYPE IMAGE
|
||||
{TERRAIN_BASE_RANDOM_LF ({TYPE}) -1000 base ({IMAGE})}
|
||||
#define TERRAIN_BASE_RANDOM TERRAINLIST IMAGESTEM
|
||||
{TERRAIN_BASE_RANDOM_LF ({TERRAINLIST}) -1000 base ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
#-----------------------------------------------------------------
|
||||
|
||||
#
|
||||
# TERRAIN ist next to at least one ADJACENT-hex
|
||||
# TERRAIN is next to at least one ADJACENT-hex
|
||||
#
|
||||
#define OVERLAY_RESTRICTED_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_RESTRICTED_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer={LAYER}
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#meta-macro OVERLAY_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#meta-macro OVERLAY_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
|
||||
|
||||
#
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
# (helper macros)
|
||||
#
|
||||
|
||||
#define OVERLAY_RESTRICTED2_N_NE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_RESTRICTED2_N_NE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer={LAYER}
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define OVERLAY_RESTRICTED2_N_SE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_RESTRICTED2_N_SE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer={LAYER}
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define OVERLAY_RESTRICTED2_N_S_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_RESTRICTED2_N_S_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer={LAYER}
|
||||
|
|
@ -155,13 +155,13 @@
|
|||
#
|
||||
# TERRAIN ist next to at least two ADJACENT-hexes
|
||||
#
|
||||
#define OVERLAY_RESTRICTED2_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED2_N_NE_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}}
|
||||
{OVERLAY_RESTRICTED2_N_SE_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}}
|
||||
{OVERLAY_RESTRICTED2_N_S_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}}
|
||||
#define OVERLAY_RESTRICTED2_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED2_N_NE_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}}
|
||||
{OVERLAY_RESTRICTED2_N_SE_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}}
|
||||
{OVERLAY_RESTRICTED2_N_S_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}}
|
||||
#enddef
|
||||
|
||||
#meta-macro OVERLAY_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#meta-macro OVERLAY_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
|
||||
|
||||
#
|
||||
|
|
@ -169,7 +169,7 @@
|
|||
# (helper macros)
|
||||
#
|
||||
|
||||
#define OVERLAY_RESTRICTED3_N_NE_SE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_RESTRICTED3_N_NE_SE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -194,7 +194,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer={LAYER}
|
||||
|
|
@ -202,7 +202,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define OVERLAY_RESTRICTED3_N_NE_S_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_RESTRICTED3_N_NE_S_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -227,7 +227,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer={LAYER}
|
||||
|
|
@ -235,7 +235,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define OVERLAY_RESTRICTED3_N_NE_SW_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_RESTRICTED3_N_NE_SW_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -260,7 +260,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer={LAYER}
|
||||
|
|
@ -268,7 +268,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define OVERLAY_RESTRICTED3_N_SE_SW_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_RESTRICTED3_N_SE_SW_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -293,7 +293,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
base=90,144
|
||||
center=90,144
|
||||
layer={LAYER}
|
||||
|
|
@ -304,18 +304,18 @@
|
|||
#
|
||||
# TERRAIN ist next to at least three ADJACENT-hexes
|
||||
#
|
||||
#define OVERLAY_RESTRICTED3_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED3_N_NE_SE_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}}
|
||||
{OVERLAY_RESTRICTED3_N_NE_S_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}}
|
||||
{OVERLAY_RESTRICTED3_N_NE_S_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}}
|
||||
{OVERLAY_RESTRICTED3_N_SE_SW_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGE}}
|
||||
#define OVERLAY_RESTRICTED3_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_N_NE_SE_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}}
|
||||
{OVERLAY_RESTRICTED3_N_NE_S_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}}
|
||||
{OVERLAY_RESTRICTED3_N_NE_S_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}}
|
||||
{OVERLAY_RESTRICTED3_N_SE_SW_PLF ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {IMAGESTEM}}
|
||||
#enddef
|
||||
|
||||
#meta-macro OVERLAY_RESTRICTED3 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#meta-macro OVERLAY_RESTRICTED3 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
|
||||
|
||||
|
||||
#define TRANSITION_RESTRICTED_PLBF TERRAIN ADJACENT PROB LAYER BASE FLAG IMAGE
|
||||
#define TRANSITION_RESTRICTED_PLBF TERRAIN ADJACENT PROB LAYER BASE FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -340,7 +340,7 @@
|
|||
rotations=n,ne,se,s,sw,nw
|
||||
|
||||
[image]
|
||||
name={IMAGE}-@R0
|
||||
name={IMAGESTEM}-@R0
|
||||
layer={LAYER}
|
||||
base={BASE}
|
||||
center=90,144
|
||||
|
|
@ -348,9 +348,9 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#meta-macro TRANSITION_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=0 B=BASE=(90,144) F=FLAG=overlay IMAGE
|
||||
#meta-macro TRANSITION_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=0 B=BASE=(90,144) F=FLAG=overlay IMAGESTEM
|
||||
|
||||
#define TRANSITION_RESTRICTED2_PLBF TERRAIN ADJACENT PROB LAYER BASE FLAG IMAGE
|
||||
#define TRANSITION_RESTRICTED2_PLBF TERRAIN ADJACENT PROB LAYER BASE FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -376,186 +376,186 @@
|
|||
[image]
|
||||
layer={LAYER}
|
||||
base={BASE}
|
||||
name={IMAGE}-@R0-@R1
|
||||
name={IMAGESTEM}-@R0-@R1
|
||||
center=90,144
|
||||
[/image]
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#meta-macro TRANSITION_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 B=BASE=(90,144) F=FLAG=overlay IMAGE
|
||||
#meta-macro TRANSITION_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 B=BASE=(90,144) F=FLAG=overlay IMAGESTEM
|
||||
|
||||
|
||||
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro OVERLAY_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro OVERLAY_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define OVERLAY_RESTRICTED_LF TERRAIN ADJACENT LAYER FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED_PF TERRAIN ADJACENT PROB FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED_PF TERRAIN ADJACENT PROB FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED_F TERRAIN ADJACENT FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED_F TERRAIN ADJACENT FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED_PL TERRAIN ADJACENT PROB LAYER IMAGE
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED_PL TERRAIN ADJACENT PROB LAYER IMAGESTEM
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED_L TERRAIN ADJACENT LAYER IMAGE
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED_L TERRAIN ADJACENT LAYER IMAGESTEM
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED_P TERRAIN ADJACENT PROB IMAGE
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED_P TERRAIN ADJACENT PROB IMAGESTEM
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED TERRAIN ADJACENT IMAGE
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) 100 0 overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED TERRAIN ADJACENT IMAGESTEM
|
||||
{OVERLAY_RESTRICTED_PLF ({TERRAIN}) ({ADJACENT}) 100 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro OVERLAY_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro OVERLAY_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define OVERLAY_RESTRICTED2_LF TERRAIN ADJACENT LAYER FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED2_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED2_PF TERRAIN ADJACENT PROB FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED2_PF TERRAIN ADJACENT PROB FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED2_F TERRAIN ADJACENT FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED2_F TERRAIN ADJACENT FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED2_PL TERRAIN ADJACENT PROB LAYER IMAGE
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED2_PL TERRAIN ADJACENT PROB LAYER IMAGESTEM
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED2_L TERRAIN ADJACENT LAYER IMAGE
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED2_L TERRAIN ADJACENT LAYER IMAGESTEM
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED2_P TERRAIN ADJACENT PROB IMAGE
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED2_P TERRAIN ADJACENT PROB IMAGESTEM
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED2 TERRAIN ADJACENT IMAGE
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) 100 0 overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED2 TERRAIN ADJACENT IMAGESTEM
|
||||
{OVERLAY_RESTRICTED2_PLF ({TERRAIN}) ({ADJACENT}) 100 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro OVERLAY_RESTRICTED3 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro OVERLAY_RESTRICTED3 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define OVERLAY_RESTRICTED3_LF TERRAIN ADJACENT LAYER FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED3_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED3_PF TERRAIN ADJACENT PROB FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED3_PF TERRAIN ADJACENT PROB FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED3_F TERRAIN ADJACENT FLAG IMAGE
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED3_F TERRAIN ADJACENT FLAG IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) 100 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED3_PL TERRAIN ADJACENT PROB LAYER IMAGE
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED3_PL TERRAIN ADJACENT PROB LAYER IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED3_L TERRAIN ADJACENT LAYER IMAGE
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED3_L TERRAIN ADJACENT LAYER IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED3_P TERRAIN ADJACENT PROB IMAGE
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED3_P TERRAIN ADJACENT PROB IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_RESTRICTED3 TERRAIN ADJACENT IMAGE
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) 100 0 overlay ({IMAGE})}
|
||||
#define OVERLAY_RESTRICTED3 TERRAIN ADJACENT IMAGESTEM
|
||||
{OVERLAY_RESTRICTED3_PLF ({TERRAIN}) ({ADJACENT}) 100 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro TRANSITION_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=0 B=BASE=(90,144) F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro TRANSITION_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=0 B=BASE=(90,144) F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define TRANSITION_RESTRICTED_LBF TERRAIN ADJACENT LAYER BASE FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({BASE}) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_LBF TERRAIN ADJACENT LAYER BASE FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({BASE}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_PBF TERRAIN ADJACENT PROB BASE FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({BASE}) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_PBF TERRAIN ADJACENT PROB BASE FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({BASE}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_BF TERRAIN ADJACENT BASE FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 ({BASE}) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_BF TERRAIN ADJACENT BASE FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 ({BASE}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) (90,144) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) (90,144) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_LF TERRAIN ADJACENT LAYER FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) (90,144) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) (90,144) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_PF TERRAIN ADJACENT PROB FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 (90,144) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_PF TERRAIN ADJACENT PROB FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 (90,144) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_F TERRAIN ADJACENT FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 (90,144) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_F TERRAIN ADJACENT FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 (90,144) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_PLB TERRAIN ADJACENT PROB LAYER BASE IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) ({BASE}) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_PLB TERRAIN ADJACENT PROB LAYER BASE IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) ({BASE}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_LB TERRAIN ADJACENT LAYER BASE IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({BASE}) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_LB TERRAIN ADJACENT LAYER BASE IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({BASE}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_PB TERRAIN ADJACENT PROB BASE IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({BASE}) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_PB TERRAIN ADJACENT PROB BASE IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({BASE}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_B TERRAIN ADJACENT BASE IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 ({BASE}) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_B TERRAIN ADJACENT BASE IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 ({BASE}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_PL TERRAIN ADJACENT PROB LAYER IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) (90,144) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_PL TERRAIN ADJACENT PROB LAYER IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) (90,144) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_L TERRAIN ADJACENT LAYER IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) (90,144) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_L TERRAIN ADJACENT LAYER IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) (90,144) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED_P TERRAIN ADJACENT PROB IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 (90,144) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED_P TERRAIN ADJACENT PROB IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 (90,144) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED TERRAIN ADJACENT IMAGE
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 (90,144) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED TERRAIN ADJACENT IMAGESTEM
|
||||
{TRANSITION_RESTRICTED_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 (90,144) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro TRANSITION_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 B=BASE=(90,144) F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro TRANSITION_RESTRICTED2 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 B=BASE=(90,144) F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define TRANSITION_RESTRICTED2_LBF TERRAIN ADJACENT LAYER BASE FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({BASE}) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_LBF TERRAIN ADJACENT LAYER BASE FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({BASE}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_PBF TERRAIN ADJACENT PROB BASE FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({BASE}) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_PBF TERRAIN ADJACENT PROB BASE FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({BASE}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_BF TERRAIN ADJACENT BASE FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 ({BASE}) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_BF TERRAIN ADJACENT BASE FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 ({BASE}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) (90,144) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) (90,144) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_LF TERRAIN ADJACENT LAYER FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) (90,144) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) (90,144) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_PF TERRAIN ADJACENT PROB FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 (90,144) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_PF TERRAIN ADJACENT PROB FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 (90,144) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_F TERRAIN ADJACENT FLAG IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 (90,144) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_F TERRAIN ADJACENT FLAG IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 (90,144) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_PLB TERRAIN ADJACENT PROB LAYER BASE IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) ({BASE}) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_PLB TERRAIN ADJACENT PROB LAYER BASE IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) ({BASE}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_LB TERRAIN ADJACENT LAYER BASE IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({BASE}) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_LB TERRAIN ADJACENT LAYER BASE IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({BASE}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_PB TERRAIN ADJACENT PROB BASE IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({BASE}) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_PB TERRAIN ADJACENT PROB BASE IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 ({BASE}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_B TERRAIN ADJACENT BASE IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 ({BASE}) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_B TERRAIN ADJACENT BASE IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 ({BASE}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_PL TERRAIN ADJACENT PROB LAYER IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) (90,144) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_PL TERRAIN ADJACENT PROB LAYER IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) (90,144) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_L TERRAIN ADJACENT LAYER IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) (90,144) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_L TERRAIN ADJACENT LAYER IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) (90,144) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2_P TERRAIN ADJACENT PROB IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 (90,144) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2_P TERRAIN ADJACENT PROB IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) ({PROB}) 0 (90,144) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_RESTRICTED2 TERRAIN ADJACENT IMAGE
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 (90,144) overlay ({IMAGE})}
|
||||
#define TRANSITION_RESTRICTED2 TERRAIN ADJACENT IMAGESTEM
|
||||
{TRANSITION_RESTRICTED2_PLBF ({TERRAIN}) ({ADJACENT}) 100 0 (90,144) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Macros for single tiles or overlays
|
||||
#
|
||||
|
||||
#define TERRAIN_BASE_PLF TERRAIN PROB LAYER FLAG IMAGE
|
||||
#define TERRAIN_BASE_PLF TERRAIN PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
[tile]
|
||||
x=0
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
type="{TERRAIN}"
|
||||
[image]
|
||||
layer={LAYER}
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
[/image]
|
||||
[/tile]
|
||||
|
||||
|
|
@ -22,11 +22,11 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#meta-macro TERRAIN_BASE TERRAIN P=PROB=100 L=LAYER=-1000 F=FLAG=base IMAGE
|
||||
#meta-macro TERRAIN_BASE TERRAIN P=PROB=100 L=LAYER=-1000 F=FLAG=base IMAGESTEM
|
||||
|
||||
|
||||
#Macro for Single Hex
|
||||
#define OVERLAY_PLF TYPE PROB LAYER FLAG IMAGE
|
||||
#define OVERLAY_PLF TERRAIN PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, *
|
||||
|
|
@ -37,14 +37,14 @@
|
|||
|
||||
[tile]
|
||||
pos=1
|
||||
type={TYPE}
|
||||
type={TERRAIN}
|
||||
no_flag={FLAG}
|
||||
set_flag={FLAG}
|
||||
[/tile]
|
||||
|
||||
probability={PROB}
|
||||
[image]
|
||||
name={IMAGE}
|
||||
name={IMAGESTEM}
|
||||
layer={LAYER}
|
||||
base=90,144
|
||||
center=90,144
|
||||
|
|
@ -52,55 +52,55 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#meta-macro OVERLAY TYPE P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#meta-macro OVERLAY TERRAINLIST P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro TERRAIN_BASE TERRAIN P=PROB=100 L=LAYER=-1000 F=FLAG=base IMAGE
|
||||
#generated from: #meta-macro TERRAIN_BASE TERRAIN P=PROB=100 L=LAYER=-1000 F=FLAG=base IMAGESTEM
|
||||
#Please do not modify
|
||||
#define TERRAIN_BASE_LF TERRAIN LAYER FLAG IMAGE
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define TERRAIN_BASE_LF TERRAINLIST LAYER FLAG IMAGESTEM
|
||||
{TERRAIN_BASE_PLF ({TERRAINLIST}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TERRAIN_BASE_PF TERRAIN PROB FLAG IMAGE
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) ({PROB}) -1000 ({FLAG}) ({IMAGE})}
|
||||
#define TERRAIN_BASE_PF TERRAINLIST PROB FLAG IMAGESTEM
|
||||
{TERRAIN_BASE_PLF ({TERRAINLIST}) ({PROB}) -1000 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TERRAIN_BASE_F TERRAIN FLAG IMAGE
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 100 -1000 ({FLAG}) ({IMAGE})}
|
||||
#define TERRAIN_BASE_F TERRAINLIST FLAG IMAGESTEM
|
||||
{TERRAIN_BASE_PLF ({TERRAINLIST}) 100 -1000 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TERRAIN_BASE_PL TERRAIN PROB LAYER IMAGE
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) ({PROB}) ({LAYER}) base ({IMAGE})}
|
||||
#define TERRAIN_BASE_PL TERRAINLIST PROB LAYER IMAGESTEM
|
||||
{TERRAIN_BASE_PLF ({TERRAINLIST}) ({PROB}) ({LAYER}) base ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TERRAIN_BASE_L TERRAIN LAYER IMAGE
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 100 ({LAYER}) base ({IMAGE})}
|
||||
#define TERRAIN_BASE_L TERRAINLIST LAYER IMAGESTEM
|
||||
{TERRAIN_BASE_PLF ({TERRAINLIST}) 100 ({LAYER}) base ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TERRAIN_BASE_P TERRAIN PROB IMAGE
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) ({PROB}) -1000 base ({IMAGE})}
|
||||
#define TERRAIN_BASE_P TERRAINLIST PROB IMAGESTEM
|
||||
{TERRAIN_BASE_PLF ({TERRAINLIST}) ({PROB}) -1000 base ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TERRAIN_BASE TERRAIN IMAGE
|
||||
{TERRAIN_BASE_PLF ({TERRAIN}) 100 -1000 base ({IMAGE})}
|
||||
#define TERRAIN_BASE TERRAINLIST IMAGESTEM
|
||||
{TERRAIN_BASE_PLF ({TERRAINLIST}) 100 -1000 base ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro OVERLAY TYPE P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGE
|
||||
#generated from: #meta-macro OVERLAY TERRAINLIST P=PROB=100 L=LAYER=0 F=FLAG=overlay IMAGESTEM
|
||||
#Please do not modify
|
||||
#define OVERLAY_LF TYPE LAYER FLAG IMAGE
|
||||
{OVERLAY_PLF ({TYPE}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_LF TERRAINLIST LAYER FLAG IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_PF TYPE PROB FLAG IMAGE
|
||||
{OVERLAY_PLF ({TYPE}) ({PROB}) 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_PF TERRAINLIST PROB FLAG IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAINLIST}) ({PROB}) 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_F TYPE FLAG IMAGE
|
||||
{OVERLAY_PLF ({TYPE}) 100 0 ({FLAG}) ({IMAGE})}
|
||||
#define OVERLAY_F TERRAINLIST FLAG IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 100 0 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_PL TYPE PROB LAYER IMAGE
|
||||
{OVERLAY_PLF ({TYPE}) ({PROB}) ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_PL TERRAINLIST PROB LAYER IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAINLIST}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_L TYPE LAYER IMAGE
|
||||
{OVERLAY_PLF ({TYPE}) 100 ({LAYER}) overlay ({IMAGE})}
|
||||
#define OVERLAY_L TERRAINLIST LAYER IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 100 ({LAYER}) overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY_P TYPE PROB IMAGE
|
||||
{OVERLAY_PLF ({TYPE}) ({PROB}) 0 overlay ({IMAGE})}
|
||||
#define OVERLAY_P TERRAINLIST PROB IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAINLIST}) ({PROB}) 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define OVERLAY TYPE IMAGE
|
||||
{OVERLAY_PLF ({TYPE}) 100 0 overlay ({IMAGE})}
|
||||
#define OVERLAY TERRAINLIST IMAGESTEM
|
||||
{OVERLAY_PLF ({TERRAINLIST}) 100 0 overlay ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
# Same as above, but for 1-tile (simple) transitions.
|
||||
|
||||
#define TRANSITION1_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define TRANSITION1_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
[image]
|
||||
layer={LAYER}
|
||||
name={IMAGE}-@R0
|
||||
name={IMAGESTEM}-@R0
|
||||
[/image]
|
||||
[/tile]
|
||||
[tile]
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
# Same as above, but for 2-tile transitions.
|
||||
|
||||
#define TRANSITION2_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define TRANSITION2_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
[image]
|
||||
layer={LAYER}
|
||||
name={IMAGE}-@R0-@R1
|
||||
name={IMAGESTEM}-@R0-@R1
|
||||
[/image]
|
||||
[/tile]
|
||||
[tile]
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
|
||||
# Same as above, but for 3-tile transitions.
|
||||
|
||||
#define TRANSITION3_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define TRANSITION3_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
[image]
|
||||
layer={LAYER}
|
||||
name={IMAGE}-@R0-@R1-@R2
|
||||
name={IMAGESTEM}-@R0-@R1-@R2
|
||||
[/image]
|
||||
[/tile]
|
||||
[tile]
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
# This will add 4-tile transitions from terrains of type g or t to terrains of
|
||||
# any other type, using the filename grassland-x-x-x-x.png
|
||||
|
||||
#define TRANSITION4_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
#define TRANSITION4_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
[terrain_graphics]
|
||||
map="
|
||||
, 2
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
|
||||
[image]
|
||||
layer={LAYER}
|
||||
name={IMAGE}-@R0-@R1-@R2-@R3
|
||||
name={IMAGESTEM}-@R0-@R1-@R2-@R3
|
||||
[/image]
|
||||
[/tile]
|
||||
[tile]
|
||||
|
|
@ -182,14 +182,14 @@
|
|||
# transitions to other terrains. The larger transitions have greater priority
|
||||
# and go first.
|
||||
|
||||
#define TRANSITION_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGE
|
||||
{TRANSITION4_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) {FLAG} {IMAGE} }
|
||||
{TRANSITION3_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) {FLAG} {IMAGE} }
|
||||
{TRANSITION2_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) {FLAG} {IMAGE} }
|
||||
{TRANSITION1_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) {FLAG} {IMAGE} }
|
||||
#define TRANSITION_BASE_PLF TERRAIN ADJACENT PROB LAYER FLAG IMAGESTEM
|
||||
{TRANSITION4_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) {FLAG} {IMAGESTEM} }
|
||||
{TRANSITION3_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) {FLAG} {IMAGESTEM} }
|
||||
{TRANSITION2_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) {FLAG} {IMAGESTEM} }
|
||||
{TRANSITION1_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) {FLAG} {IMAGESTEM} }
|
||||
#enddef
|
||||
|
||||
#meta-macro TRANSITION_BASE TERRAIN ADJACENT P=PROB=100 L=LAYER=-500 F=FLAG=transition IMAGE
|
||||
#meta-macro TRANSITION_BASE TERRAIN ADJACENT P=PROB=100 L=LAYER=-500 F=FLAG=transition IMAGESTEM
|
||||
|
||||
|
||||
# This utility macro disables standard transitions on a given terrain type. It
|
||||
|
|
@ -206,33 +206,33 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define DISABLE_BASE_TRANSITIONS TERRAIN
|
||||
{DISABLE_BASE_TRANSITIONS_F {TERRAIN} transition}
|
||||
#define DISABLE_BASE_TRANSITIONS TERRAINLIST
|
||||
{DISABLE_BASE_TRANSITIONS_F {TERRAINLIST} transition}
|
||||
#enddef
|
||||
|
||||
|
||||
#The following code is autogenerated by expand-terrain-macros.py
|
||||
#generated from: #meta-macro TRANSITION_BASE TERRAIN ADJACENT P=PROB=100 L=LAYER=-500 F=FLAG=transition IMAGE
|
||||
#generated from: #meta-macro TRANSITION_BASE TERRAINLIST ADJACENT P=PROB=100 L=LAYER=-500 F=FLAG=transition IMAGESTEM
|
||||
#Please do not modify
|
||||
#define TRANSITION_BASE_LF TERRAIN ADJACENT LAYER FLAG IMAGE
|
||||
{TRANSITION_BASE_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_BASE_LF TERRAINLIST ADJACENT LAYER FLAG IMAGESTEM
|
||||
{TRANSITION_BASE_PLF ({TERRAINLIST}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_BASE_PF TERRAIN ADJACENT PROB FLAG IMAGE
|
||||
{TRANSITION_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) -500 ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_BASE_PF TERRAINLIST ADJACENT PROB FLAG IMAGESTEM
|
||||
{TRANSITION_BASE_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) -500 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_BASE_F TERRAIN ADJACENT FLAG IMAGE
|
||||
{TRANSITION_BASE_PLF ({TERRAIN}) ({ADJACENT}) 100 -500 ({FLAG}) ({IMAGE})}
|
||||
#define TRANSITION_BASE_F TERRAINLIST ADJACENT FLAG IMAGESTEM
|
||||
{TRANSITION_BASE_PLF ({TERRAINLIST}) ({ADJACENT}) 100 -500 ({FLAG}) ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_BASE_PL TERRAIN ADJACENT PROB LAYER IMAGE
|
||||
{TRANSITION_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) ({LAYER}) transition ({IMAGE})}
|
||||
#define TRANSITION_BASE_PL TERRAINLIST ADJACENT PROB LAYER IMAGESTEM
|
||||
{TRANSITION_BASE_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) ({LAYER}) transition ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_BASE_L TERRAIN ADJACENT LAYER IMAGE
|
||||
{TRANSITION_BASE_PLF ({TERRAIN}) ({ADJACENT}) 100 ({LAYER}) transition ({IMAGE})}
|
||||
#define TRANSITION_BASE_L TERRAINLIST ADJACENT LAYER IMAGESTEM
|
||||
{TRANSITION_BASE_PLF ({TERRAINLIST}) ({ADJACENT}) 100 ({LAYER}) transition ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_BASE_P TERRAIN ADJACENT PROB IMAGE
|
||||
{TRANSITION_BASE_PLF ({TERRAIN}) ({ADJACENT}) ({PROB}) -500 transition ({IMAGE})}
|
||||
#define TRANSITION_BASE_P TERRAINLIST ADJACENT PROB IMAGESTEM
|
||||
{TRANSITION_BASE_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) -500 transition ({IMAGESTEM})}
|
||||
#enddef
|
||||
#define TRANSITION_BASE TERRAIN ADJACENT IMAGE
|
||||
{TRANSITION_BASE_PLF ({TERRAIN}) ({ADJACENT}) 100 -500 transition ({IMAGE})}
|
||||
#define TRANSITION_BASE TERRAINLIST ADJACENT IMAGESTEM
|
||||
{TRANSITION_BASE_PLF ({TERRAINLIST}) ({ADJACENT}) 100 -500 transition ({IMAGESTEM})}
|
||||
#enddef
|
||||
#end of generated code
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
usage=fighter
|
||||
description= _ "The more experienced Dwarvish Steelclad fighters wear heavy chain mail and plate armor, for which they are rightly famous."
|
||||
die_sound={SOUND_LIST:DWARF_DIE}
|
||||
{DEFENSE_ANIM "units/dwarves/steelclad-defend-2.png" "units/dwarves/steelclad-1.png" {SOUND_LIST:DWARF_HIT} }
|
||||
{DEFENSE_ANIM "units/dwarves/steelclad-defend-2.png" "units/dwarves/steelclad-defend-1.png" {SOUND_LIST:DWARF_HIT} }
|
||||
[resistance]
|
||||
blade=70
|
||||
pierce=70
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ message= {MENU_IMG_TXT2 "terrain/hills-variation2.png" _"@Smash Cave Floor" _"`C
|
|||
# Harvest Cave Mushrooms
|
||||
|
||||
[option]
|
||||
message= {MENU_IMG_TXT2 "terrain/cave/floor1.png" _"@Harvest Mushrooms" _"`Earns: 3g"}
|
||||
message= {MENU_IMG_TXT2 "terrain/cave/floor.png" _"@Harvest Mushrooms" _"`Earns: 3g"}
|
||||
{ANL_SHOW_IF ("Peasant") "Uu^Uf"}
|
||||
[command]
|
||||
{VARIABLE finished yes}
|
||||
|
|
|
|||
|
|
@ -164,11 +164,11 @@ def actualtype(a):
|
|||
atype = "range"
|
||||
elif a in ("lawful", "neutral", "chaotic"):
|
||||
atype = "alignment"
|
||||
elif a.startswith("{") and a.endswith("}") or a.startswith("$"):
|
||||
elif a.startswith("{") or a.endswith("}") or a.startswith("$"):
|
||||
atype = None # Can't tell -- it's a macro expansion
|
||||
elif re.match(image_reference, a):
|
||||
atype = "image"
|
||||
elif re.match(r"[A-Z][a-z]+\^[A-Z][a-z\\|/]+\Z", a):
|
||||
elif re.match(r"(\*|[A-Z][a-z]+)\^[A-Z][a-z\\|/]+\Z", a):
|
||||
atype = "terrain_code"
|
||||
elif a.endswith(".wav") or a.endswith(".ogg"):
|
||||
atype = "sound"
|
||||
|
|
@ -500,6 +500,9 @@ class CrossRef:
|
|||
print "%s: more than one definition of %s is visible here." % (Reference(ns, fn, n), name)
|
||||
if candidates == 0:
|
||||
self.unresolved.append((name,Reference(ns,fn,n+1,args=args)))
|
||||
# Don't be fooled by HTML image references in help strings.
|
||||
if "<img>" in line:
|
||||
continue
|
||||
# Find references to resource files
|
||||
for match in re.finditer(CrossRef.file_reference, line):
|
||||
name = match.group(0)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue