Adding weathered stone walls (Xoa) and floor (Ias) (#4938)

* Terrain - Ias - stone floor variation

* terrain - Xoa - Ancient stone walls

* terrain Xoa - more complete transition image set

* terrain - Ias, Xoa - minor additions and touch-ups
This commit is contained in:
doofus-01 2020-06-07 15:51:16 -07:00 committed by GitHub
parent fd5368e7d7
commit f8242cc648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 39 additions and 9 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

View file

@ -531,7 +531,10 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:BASE Ha hills/snow}
# raised base to get it over the chasm images (LAYER=-284), then raised even higher to get over chasm-castle transition images (LAYER=-186)
# Interior floors
{NEW:BASE Ias interior/stone-ancient}
# 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}
@ -784,13 +787,14 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
# installing new wood floor transitions - need to be above this DISABLE line
# be careful with wild-card filters: "I*r" includes "Irs"
# "Ias" is not included in this, it uses more generic transitions
{NEW:THREE_TERRAIN_TRANSITION Irs,Icr Q* G*,R*,D*,A*,W*,Uu,Ur,Urc,S* -282 interior/stone-chasm/stone-regular}
{NEW:TRANSITION_CROWDED Irs,Icr Q* -282 interior/stone-chasm/stone-regular}
{NEW:TRANSITION_CROWDED Irs,Icr W*,G*,R*,D*,A*,Uu,Ur,Urc,S* -282 interior/stone-regular}
{NEW:TRANSITION Irs,Icr Q* -282 interior/stone-chasm/stone-regular}
{NEW:TRANSITION Irs,Icr !,Irs,Irr,!,I*r,Q*,W*,G*,R*,D*,A*,Uu,Ur,Urc,S* -282 interior/stone-regular}
{NEW:TRANSITION Iwr,Ior,Icn G*,R*,D*,A*,Ur,Urc -283 interior/wood-regular}
{NEW:TRANSITION Iwr,Ior,Icn G*,R*,D*,A*,Ur,Urc,Ias -283 interior/wood-regular}
{NEW:TRANSITION Iwr,Icn W*,S*,Qx* -283 interior/wood-chasm/wood-clean}
{NEW:TRANSITION Ior W*,S*,Qx* -283 interior/wood-chasm/wood-regular}
{NEW:TRANSITION Iwr,Ior,Icn Ql* -283 interior/wood-chasm/wood-burnt}
@ -816,6 +820,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:WALL2_CORNER (Xom,Xoi) Xu* (!,Xu*,Xo*) walls/stone/wall-mine-mixed}
{NEW:WALL2 (Xom,Xoi) Xu* (!,Xu*,Xo*) walls/stone/wall-mine-mixed}
{NEW:WALL2_CORNER (Xoa) Xu* (!,Xu*,Xo*) walls/stone/ancient/wall-mixed}
{NEW:WALL2 (Xoa) Xu* (!,Xu*,Xo*) walls/stone/ancient/wall-mixed}
{NEW:WALL2_CORNER (Xo*) Xu* (!,Xu*,Xo*) walls/stone/wall-mixed}
{NEW:WALL2 (Xo*) Xu* (!,Xu*,Xo*) walls/stone/wall-mixed}
{NEW:WALL Xu* (!,Xu*,Xo*) cave/wall-rough}
@ -824,6 +830,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:WALL_CORNER Xoi (!,Xo*,Xu*) walls/stone/wall-stone-white}
{NEW:WALL_CORNER Xom,Xoi (!,Xo*,Xu*) walls/stone/wall-stone-mine}
{NEW:WALL_CORNER Xoc (!,Xo*,Xu*) walls/stone/clean/wall-stone}
{NEW:WALL_CORNER Xoa (!,Xo*,Xu*) walls/stone/ancient/wall-stone}
{NEW:WALL_CORNER Xot (!,Xo*,Xu*) walls/stone/catacombs/wall-stone}
{NEW:WALL_CORNER Xo* (!,Xo*,Xu*) walls/stone/wall-stone}
{NEW:WALL_A10 Xol (!,Xu*,Xo*) walls/stone/lit/wall-stone-lit}
@ -832,6 +839,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:WALL Xom,Xoi (!,Xu*,Xo*) walls/stone/wall-stone-mine}
{NEW:WALL Xoc (!,Xu*,Xo*) walls/stone/clean/wall-stone}
{NEW:WALL_MINOR_VARIANTS Xoc Xo* (!,Xu*,Xo*) walls/stone/clean/wall-stone}
{NEW:WALL Xoa (!,Xu*,Xo*) walls/stone/ancient/wall-stone}
{NEW:WALL_MINOR_VARIANTS Xoa Xo* (!,Xu*,Xo*) walls/stone/ancient/wall-stone}
{NEW:WALL Xot^Edb (!,Xu*,Xo*) walls/stone/catacombs/wall-bones FLAG=bones BASE=1,108}
{NEW:WALL Xot (!,Xu*,Xo*) walls/stone/catacombs/wall-stone}
{NEW:WALL_MINOR_VARIANTS Xot Xo* (!,Xu*,Xo*) walls/stone/catacombs/wall-stone}
@ -920,9 +929,9 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:TRANSITION Gs Gg,Gd,Gll -257 grass/semi-dry-long}
{NEW:TRANSITION Gs (R*,D*,Aa,Ur,Urc) -260 grass/semi-dry-medium}
{NEW:TRANSITION Gg (R*,D*,Aa,Ur,Urc) -261 grass/green-medium}
{NEW:TRANSITION Gd (R*,D*,Aa,Ur,Urc) -262 grass/dry-medium}
{NEW:TRANSITION Gs (R*,D*,Aa,Ur,Urc,Ias) -260 grass/semi-dry-medium}
{NEW:TRANSITION Gg (R*,D*,Aa,Ur,Urc,Ias) -261 grass/green-medium}
{NEW:TRANSITION Gd (R*,D*,Aa,Ur,Urc,Ias) -262 grass/dry-medium}
{NEW:TRANSITION Gll (!,Gll,Q*,W*,Ai,C*,K*) -270 grass/leaf-litter}
@ -935,7 +944,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
# This transitions from bank to flat terrains.
{NEW:TRANSITION (W*,Ai) (R*,Gll) -300 flat/bank}
{NEW:TRANSITION (W*,Ai) (R*,Gll,Ias) -300 flat/bank}
{NEW:TRANSITION (Sm) (R*,D*) -310 swamp/mud-to-land}
@ -964,8 +973,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:TRANSITION (!,Re,Rr*,Hh*,M*,Q*,D*,T*) Re -379 flat/dirt FLAG=inside}
{NEW:TRANSITION Re (!,Re,Rr*,W*,Ai,Q*,D*,T*) -380 flat/dirt}
{NEW:TRANSITION (!,Rb,Rr*,W*,Ai,Q*,D*,T*) Rb -384 flat/dirt-dark FLAG=inside}
{NEW:TRANSITION Rb (!,Rb,Rr*,W*,Ai,Q*,D*,T*) -388 flat/dirt-dark}
{NEW:TRANSITION (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Ias) Rb,Ias -384 flat/dirt-dark FLAG=inside}
{NEW:TRANSITION Rb,Ias (!,Rb,Rr*,W*,Ai,Q*,D*,T*,Ias) -388 flat/dirt-dark}
# This complicated part keeps the submerged part of ice or a bank from drawing over the above-water parts of banks or ice
@ -974,7 +983,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:TRANSITION (Mm,Hh) Ai,W*,S* -482 hills/regular-to-water FLAG=non_submerged}
{NEW:TRANSITION (Md,Hhd,Mv) Ai,W*,S* -482 hills/dry-to-water FLAG=non_submerged}
{NEW:TRANSITION (R*,G*,Uue) Ai,W* -483 flat/bank-to-ice FLAG=non_submerged}
{NEW:TRANSITION (R*,G*,Uue,Ias) Ai,W* -483 flat/bank-to-ice FLAG=non_submerged}
{NEW:TRANSITION (U*,Xu*,Ql*) Ai,W*,S* -486 cave/bank FLAG=non_submerged}

View file

@ -842,6 +842,16 @@ Most units receive 20 to 40% defense in sand."
editor_group=flat
[/terrain_type]
[terrain_type]
name= _ "Stone Floor"
id=ancient_stone_floor
symbol_image=interior/stone-ancient
editor_name= _ "Ancient Stone Floor"
string=Ias
aliasof=Gt
editor_group=flat
[/terrain_type]
[terrain_type]
name= _ "Rug"
id=rug_floor
@ -1301,6 +1311,17 @@ Occasionally caves are <italic>text='illuminated'</italic>."
editor_group=cave,obstacle
[/terrain_type]
[terrain_type]
symbol_image=void/void
editor_image=walls/stone/ancient/wall-stone-tile
id=wall_stone_ancient
name= _ "Stone Wall"
editor_name= _ "Ancient Stone Wall"
string=Xoa
aliasof=Xt
editor_group=cave,obstacle
[/terrain_type]
[terrain_type]
symbol_image=void/void
editor_image=walls/stone/catacombs/wall-stone-tile