upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 16:53:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

hills transitions for hex with small mountain catch-all rule (#7191)

Browse Source 
fixes #7180
This commit is contained in:
doofus-01 2022-12-04 11:52:53 -08:00 committed by GitHub
parent 12a7f018e0
commit e22da0ea99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/core/terrain-graphics.cfg
View File

@ -261,6 +261,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
{NEW:MOUNTAINS_2x2 Mm mountains/basic5 FLAG=base,base2 PROB=40}
{NEW:MOUNTAINS_2x2 Mm mountains/basic6 FLAG=base,base2 PROB=30}
# there is a transition rule below for where the mountain graphic isn't large enough to cover up the hex edges
{NEW:MOUNTAIN_SMALL Mm (!,Xv,!,C*,K*,X*,Ql,Qx*) mountains/basic-castle-n FLAG=base2 }
{NEW:MOUNTAIN_SINGLE Mm mountains/basic FLAG=base,base2 }
@ -1127,6 +1128,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^Qh*,*^V*,*^B*,_off^_usr#enddef
{NEW:TRANSITION (Mm) (Hd,Hhd,Rb,Re,Rd,D*,Gd,Ha,A*,U*,Ql*) -166 hills/dry}
{NEW:TRANSITION (Ms) (Hd,Hhd,Rb,Re,Rd,D*,Gd,U*,Ql*) -166 hills/dry}
{NEW:TRANSITION (Ms) (Mm,Md) -170 hills/snow-to-hills FILTER_FLAG=mountain-small-3}
{NEW:TRANSITION (Ms,Ha) Hh* -170 hills/snow-to-hills}
{NEW:TRANSITION (Ms,Ha) (W*,S*) -171 hills/snow-to-water}
{NEW:TRANSITION (Ms,Ha) (!,Ha,Qx*,Mm,Ms,Md) -172 hills/snow}

9
data/core/terrain-graphics/new-macros.cfg
View File

@ -1104,6 +1104,9 @@ _off^_usr#endarg
#arg FLAG
transition#endarg
#arg FILTER_FLAG
#endarg
#arg IPF
~NOP()#endarg
@ -1232,6 +1235,7 @@ transition#endarg
pos=1
type={ADJACENT}
set_no_flag={FLAG}-@R0,{FLAG}-@R1,{FLAG}-@R2,{FLAG}-@R3,{FLAG}-@R4,{FLAG}-@R5
has_flag={FILTER_FLAG}
[image]
name={IMAGESTEM}-@R0-@R1-@R2-@R3-@R4-@R5.png{IPF}
layer={LAYER}
@ -1281,6 +1285,7 @@ transition#endarg
pos=1
type={ADJACENT}
set_no_flag={FLAG}-@R0,{FLAG}-@R1,{FLAG}-@R2,{FLAG}-@R3,{FLAG}-@R4
has_flag={FILTER_FLAG}
[image]
name={IMAGESTEM}-@R0-@R1-@R2-@R3-@R4.png{IPF}
layer={LAYER}
@ -1325,6 +1330,7 @@ transition#endarg
pos=1
type={ADJACENT}
set_no_flag={FLAG}-@R0,{FLAG}-@R1,{FLAG}-@R2,{FLAG}-@R3
has_flag={FILTER_FLAG}
[image]
name={IMAGESTEM}-@R0-@R1-@R2-@R3.png{IPF}
layer={LAYER}
@ -1364,6 +1370,7 @@ transition#endarg
pos=1
type={ADJACENT}
set_no_flag={FLAG}-@R0,{FLAG}-@R1,{FLAG}-@R2
has_flag={FILTER_FLAG}
[image]
name={IMAGESTEM}-@R0-@R1-@R2.png{IPF}
layer={LAYER}
@ -1398,6 +1405,7 @@ transition#endarg
pos=1
type={ADJACENT}
set_no_flag={FLAG}-@R0,{FLAG}-@R1
has_flag={FILTER_FLAG}
[image]
name={IMAGESTEM}-@R0-@R1.png{IPF}
layer={LAYER}
@ -1427,6 +1435,7 @@ transition#endarg
pos=1
type={ADJACENT}
set_no_flag={FLAG}-@R0
has_flag={FILTER_FLAG}
[image]
name={IMAGESTEM}-@R0.png{IPF}
layer={LAYER}