diff --git a/data/core/about_i18n.cfg b/data/core/about_i18n.cfg index 1cf31150771..7f8881b68d7 100644 --- a/data/core/about_i18n.cfg +++ b/data/core/about_i18n.cfg @@ -1066,7 +1066,7 @@ sort=yes name = "Benny Lin" [/entry] [entry] - name = "Irsyad Musthafa" + name = "Irsyad Musthafa" # wmllint: noconvert comment = "translation maintainer" email = "sevennightmare_AT_tutanota.de" [/entry] diff --git a/data/core/editor/help.cfg b/data/core/editor/help.cfg index 167c26fc576..1b59dbc5c59 100644 --- a/data/core/editor/help.cfg +++ b/data/core/editor/help.cfg @@ -166,6 +166,7 @@ This turns any base terrain into a village, providing income and healing." + " Fake Shroud looks like an unexplored area, even in scenarios that have shroud disabled and even when the player’s units can see the hex." [/topic] +# wmllint: markcheck off [topic] id=editor_terrain_elevation title= _ "Terrain Elevation Graphics" @@ -202,6 +203,7 @@ The graphics used to represent the ledge borders are determined by the base terr " + _ "editor^text='Note for UMC authors: The flood-filled tiles do not have their terrain codes changed, or any other properties affected, so filtering a location by elevation is not simple.' italic='yes' font_size=10 " [/topic] +# wmllint: markcheck on [topic] id=editor_deprecated_overlay diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg index f1d6854e402..efd18d9927c 100644 --- a/data/core/terrain-graphics.cfg +++ b/data/core/terrain-graphics.cfg @@ -28,11 +28,11 @@ {EDITOR_DEPRECATED *^Uf*} {EDITOR_DEPRECATED Xol} {EDITOR_DEPRECATED Xuce} -{EDITOR_DEPRECATED Irs} -{EDITOR_DEPRECATED Ias} -{EDITOR_DEPRECATED Icr} -{EDITOR_DEPRECATED Ior} -{EDITOR_DEPRECATED Icn} +{EDITOR_DEPRECATED Irs} # wmllint: noconvert +{EDITOR_DEPRECATED Ias} # wmllint: noconvert +{EDITOR_DEPRECATED Icr} # wmllint: noconvert +{EDITOR_DEPRECATED Ior} # wmllint: noconvert +{EDITOR_DEPRECATED Icn} # wmllint: noconvert ############################################################# # Macros for where normal terrain code filtering doesn't work @@ -44,11 +44,11 @@ Rb,Re,Rd,Rp,Rr,Rrc,Rra#enddef # deprecated codes, as of 1.17.9 #define TG_BUILT_STONE -Irs,Icr#enddef +Irs,Icr#enddef # wmllint: noconvert # deprecated codes, as of 1.17.9 #define TG_BUILT_WOOD -Iwr,Ior,Icn#enddef +Iwr,Ior,Icn#enddef # wmllint: noconvert ############################################################# @@ -638,11 +638,11 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef {NEW:BASE (Isr,Isc) interior/stone-regular LAYER=-284 FLAG=raised_base} # deprecated codes, for compatibility -{NEW:BASE Ias interior/stone-ancient} +{NEW:BASE Ias interior/stone-ancient} # wmllint: noconvert # raised base to get it over the chasm images (LAYER=-284) -{NEW:BASE Iwr,Icn interior/wood-regular LAYER=-284 FLAG=raised_base} -{NEW:BASE Ior interior/wood-ruined LAYER=-284 FLAG=raised_base} -{NEW:BASE Irs,Icr interior/stone-regular LAYER=-284 FLAG=raised_base} +{NEW:BASE Iwr,Icn interior/wood-regular LAYER=-284 FLAG=raised_base} # wmllint: noconvert +{NEW:BASE Ior interior/wood-ruined LAYER=-284 FLAG=raised_base} # wmllint: noconvert +{NEW:BASE Irs,Icr interior/stone-regular LAYER=-284 FLAG=raised_base} # wmllint: noconvert # # Water base terrains @@ -894,8 +894,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef {NEW:TRANSITION_INVERTED Iwc !,Iwc -223 interior/regular-rug/rug FLAG=regular_rug} # deprecated terrain codes, for compatibility -{NEW:TRANSITION_INVERTED Icr !,Icr -221 interior/royal-rug/rug FLAG=royal_rug} -{NEW:TRANSITION_INVERTED Icn !,Icn -223 interior/regular-rug/rug FLAG=regular_rug} +{NEW:TRANSITION_INVERTED Icr !,Icr -221 interior/royal-rug/rug FLAG=royal_rug} # wmllint: noconvert +{NEW:TRANSITION_INVERTED Icn !,Icn -223 interior/regular-rug/rug FLAG=regular_rug} # wmllint: noconvert # # this one uses the Ur underlayer {NEW:DISABLE_TRANSITION (Urc) (Uu*) } @@ -917,16 +917,16 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef {NEW:TRANSITION Iw* Ql* -283 interior/wood-chasm/wood-burnt} # compatibility code for deprecated terrain codes -{NEW:THREE_TERRAIN_TRANSITION Irs,Icr Q* G*,R*,D*,A*,Uu,Ur,Urc -222 interior/stone-chasm/stone-regular} -{NEW:THREE_TERRAIN_TRANSITION Irs,Icr Q* W* -222 interior/stone-chasm/stone-dock-regular} -{NEW:TRANSITION_CROWDED !,*^Qh*,!,Irs,Icr Q* -222 interior/stone-chasm/stone-regular} -{NEW:TRANSITION_CROWDED !,*^Qh*,!,Irs,Icr W*,S*,G*,R*,D*,A*,Uu,Ur,Urc -222 interior/stone-regular} +{NEW:THREE_TERRAIN_TRANSITION Irs,Icr Q* G*,R*,D*,A*,Uu,Ur,Urc -222 interior/stone-chasm/stone-regular} # wmllint: noconvert +{NEW:THREE_TERRAIN_TRANSITION Irs,Icr Q* W* -222 interior/stone-chasm/stone-dock-regular} # wmllint: noconvert +{NEW:TRANSITION_CROWDED !,*^Qh*,!,Irs,Icr Q* -222 interior/stone-chasm/stone-regular} # wmllint: noconvert +{NEW:TRANSITION_CROWDED !,*^Qh*,!,Irs,Icr W*,S*,G*,R*,D*,A*,Uu,Ur,Urc -222 interior/stone-regular} # wmllint: noconvert {NEW:TRANSITION {TG_BUILT_STONE} Q* -282 interior/stone-chasm/stone-regular} -{NEW:TRANSITION !,*^Qh*,!,{TG_BUILT_STONE} W*,S* -222 interior/stone-dock-regular LAYER2=-221 ADJACENT2=!,Irs,Icr,W*,S*} -{NEW:TRANSITION {TG_BUILT_STONE} !,Irs,Icr,!,I*r,Q*,W*,G*,R*,D*,A*,Uu,Ur,Urc,S* -222 interior/stone-regular} -{NEW:TRANSITION {TG_BUILT_WOOD} G*,R*,D*,A*,Ur,Urc,Ias -283 interior/wood-regular} +{NEW:TRANSITION !,*^Qh*,!,{TG_BUILT_STONE} W*,S* -222 interior/stone-dock-regular LAYER2=-221 ADJACENT2=!,Irs,Icr,W*,S*} # wmllint: noconvert +{NEW:TRANSITION {TG_BUILT_STONE} !,Irs,Icr,!,I*r,Q*,W*,G*,R*,D*,A*,Uu,Ur,Urc,S* -222 interior/stone-regular} # wmllint: noconvert +{NEW:TRANSITION {TG_BUILT_WOOD} G*,R*,D*,A*,Ur,Urc,Ias -283 interior/wood-regular} # wmllint: noconvert {NEW:TRANSITION {TG_BUILT_WOOD} W*,S*,Qx* -283 interior/wood-chasm/wood-clean} -{NEW:TRANSITION Ior W*,S*,Qx* -283 interior/wood-chasm/wood-regular} +{NEW:TRANSITION Ior W*,S*,Qx* -283 interior/wood-chasm/wood-regular} # wmllint: noconvert {NEW:TRANSITION {TG_BUILT_WOOD} Ql* -283 interior/wood-chasm/wood-burnt} # end compatibility code @@ -1043,7 +1043,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef {NEW:WALL_TRANSITION2 Ql Qx*,Xv,_off^_usr (!,Ql,Qx*) unwalkable/lava-chasm LAYER=-290 FLAG=ground} {NEW:WALL_TRANSITION2 Qlf Qx*,Xv,_off^_usr (!,Ql*,Qx*) unwalkable/lava-chasm LAYER=-290 FLAG=ground} -# no compatibility code for ^Qh* overlays on Irs,Ias,Icr,Ior,Icn - no stable legacy maps would have such combinations +# no compatibility code for ^Qh* overlays on Irs,Ias,Icr,Ior,Icn - no stable legacy maps would have such combinations # wmllint: noconvert {NEW:WALL_TRANSITION2 (!,I*,!,*^Qhu*) (!,Ql,Qx*,Xv,_off^_usr,*^Qh*,Is*) (!,*^Qh*,!,Isa) elevation/ancient-stone/corner-stone LAYER=-90 FLAG=ground} {NEW:WALL_TRANSITION2 (!,I*,!,*^Qhu*) (!,Ql,Qx*,Xv,_off^_usr,*^Qh*,Is*) (!,*^Qh*,!,Is*) elevation/stone/corner-stone LAYER=-90 FLAG=ground} {NEW:WALL_TRANSITION2 (!,I*,!,*^Qhu*) (!,Ql,Qx*,Xv,_off^_usr,*^Qh*,Iw*) (!,*^Qh*,!,Iw*) elevation/wood/corner-wood LAYER=-90 FLAG=ground} diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg index e7fc403f4d1..68b10c45581 100644 --- a/data/core/terrain.cfg +++ b/data/core/terrain.cfg @@ -3474,7 +3474,7 @@ Most units have 50 to 60% defense in villages, whereas cavalry receive only 40%. id=regular_stone_floor_deprecated symbol_image=interior/stone-regular editor_name= _ "Deprecated" - string=Irs + string=Irs # wmllint: noconvert aliasof=Gt hidden=yes hide_help=yes @@ -3485,7 +3485,7 @@ Most units have 50 to 60% defense in villages, whereas cavalry receive only 40%. id=ancient_stone_floor_deprecated symbol_image=interior/stone-ancient editor_name= _ "Deprecated" - string=Ias + string=Ias # wmllint: noconvert aliasof=Gt hidden=yes hide_help=yes @@ -3496,7 +3496,7 @@ Most units have 50 to 60% defense in villages, whereas cavalry receive only 40%. id=rug_floor_deprecated symbol_image=interior/royal-rug/rug-tile editor_name= _ "Deprecated" - string=Icr + string=Icr # wmllint: noconvert aliasof=Gt hidden=yes hide_help=yes @@ -3507,7 +3507,7 @@ Most units have 50 to 60% defense in villages, whereas cavalry receive only 40%. id=rug2_floor_deprecated symbol_image=interior/regular-rug/rug-tile editor_name= _ "Deprecated" - string=Icn + string=Icn # wmllint: noconvert aliasof=Gt hidden=yes hide_help=yes @@ -3518,7 +3518,7 @@ Most units have 50 to 60% defense in villages, whereas cavalry receive only 40%. id=old_wood_floor_deprecated symbol_image=interior/wood-ruined editor_name= _ "Deprecated" - string=Ior + string=Ior # wmllint: noconvert aliasof=Gt hidden=yes hide_help=yes