fixes to sone tiles Irs and addition of basic clean walls variation Xoc (#2014)
doofus-01
GitHub
|
After Width: | Height: | Size: 7.4 KiB |
|
After Width: | Height: | Size: 7.8 KiB |
|
After Width: | Height: | Size: 9.1 KiB |
|
After Width: | Height: | Size: 8.2 KiB |
BIN
data/core/images/terrain/interior/stone-regular-nw-n.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
data/core/images/terrain/interior/stone-regular-sw-nw-n-ne.png
Normal file
|
After Width: | Height: | Size: 6.1 KiB |
BIN
data/core/images/terrain/interior/stone-regular-sw-nw-n.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
|
After Width: | Height: | Size: 9.1 KiB |
|
After Width: | Height: | Size: 9.2 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 2.4 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 12 KiB |
BIN
data/core/images/terrain/walls/stone/clean/wall-stone-tile.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
|
After Width: | Height: | Size: 9.3 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 2.4 KiB |
|
|
@ -523,10 +523,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=-86)
|
||||
{NEW:BASE Iwr interior/wood-regular LAYER=-86 FLAG=raised_base}
|
||||
{NEW:BASE Ior interior/wood-ruined LAYER=-86 FLAG=raised_base}
|
||||
{NEW:BASE Irs interior/stone-regular LAYER=-86 FLAG=raised_base}
|
||||
# raised base to get it over the chasm images (LAYER=-284), then raised even higher to get over chasm-castle transition images (LAYER=-186)
|
||||
{NEW:BASE Iwr interior/wood-regular LAYER=-284 FLAG=raised_base}
|
||||
{NEW:BASE Ior interior/wood-ruined LAYER=-284 FLAG=raised_base}
|
||||
{NEW:BASE Irs interior/stone-regular LAYER=-284 FLAG=raised_base}
|
||||
|
||||
|
||||
# Water base terrains
|
||||
|
|
@ -716,15 +716,16 @@ 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"
|
||||
{NEW:THREE_TERRAIN_TRANSITION Irs Q* G*,R*,D*,A*,W*,H*,M*,U*,S* -84 interior/stone-chasm/stone-regular}
|
||||
{NEW:TRANSITION_CROWDED Irs Q* -84 interior/stone-chasm/stone-regular}
|
||||
{NEW:TRANSITION_CROWDED Irs G*,R*,D*,A*,W*,H*,M*,U*,S* -84 interior/stone-regular}
|
||||
{NEW:TRANSITION Irs Q* -84 interior/stone-chasm/stone-regular}
|
||||
{NEW:TRANSITION Irs !,Irs,!,I*r,Q*,W*,G*,R*,D*,A*,H*,M*,U*,S* -84 interior/stone-regular}
|
||||
{NEW:TRANSITION Iwr,Ior G*,R*,D*,A*,H*,M*,U* -85 interior/wood-regular}
|
||||
{NEW:TRANSITION Iwr W*,S*,Qx* -85 interior/wood-chasm/wood-clean}
|
||||
{NEW:TRANSITION Ior W*,S*,Qx* -85 interior/wood-chasm/wood-regular}
|
||||
{NEW:TRANSITION Iwr,Ior Ql* -85 interior/wood-chasm/wood-burnt}
|
||||
|
||||
{NEW:THREE_TERRAIN_TRANSITION Irs Q* G*,R*,D*,A*,W*,Uu,Ur,S* -282 interior/stone-chasm/stone-regular}
|
||||
{NEW:TRANSITION_CROWDED Irs Q* -282 interior/stone-chasm/stone-regular}
|
||||
{NEW:TRANSITION_CROWDED Irs W*,G*,R*,D*,A*,Uu,Ur,S* -282 interior/stone-regular}
|
||||
{NEW:TRANSITION Irs Q* -282 interior/stone-chasm/stone-regular}
|
||||
{NEW:TRANSITION Irs !,Irs,!,I*r,Q*,W*,G*,R*,D*,A*,Uu,Ur,S* -282 interior/stone-regular}
|
||||
{NEW:TRANSITION Iwr,Ior G*,R*,D*,A*,Ur -283 interior/wood-regular}
|
||||
{NEW:TRANSITION Iwr 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 Ql* -283 interior/wood-chasm/wood-burnt}
|
||||
|
||||
{DISABLE_BASE_TRANSITIONS Qx*,Ql*,Xu*,Xo*,Cud,Kud}
|
||||
|
||||
|
|
@ -754,17 +755,21 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
|
|||
# Xoi and Xom both have wooden trim, so "white" wall images are only needed for walls with visible faces.
|
||||
{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 Xo* (!,Xo*,Xu*) walls/stone/wall-stone}
|
||||
{NEW:WALL_A10 Xol (!,Xu*,Xo*) walls/stone/lit/wall-stone-lit}
|
||||
{NEW:WALL Xoi (!,Xu*,Xo*) walls/stone/wall-stone-white}
|
||||
{NEW:WALL Xom,Xoi (!,Xu*,Xo*) walls/stone/wall-stone-mine}
|
||||
{NEW:WALL Xoc (!,Xu*,Xo*) walls/stone/clean/wall-stone}
|
||||
{NEW:WALL Xo* (!,Xu*,Xo*) walls/stone/wall-stone}
|
||||
|
||||
# New Generic Castle-to Chasm transition
|
||||
{TRANSITION_COMPLETE_LF (Cha,Kha,Coa,Koa,Cea,Kea) Qx* -89 transition2 chasm/regular-snow-castle}
|
||||
{TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*) Qxe -89 transition2 chasm/earthy-castle}
|
||||
# Xo* included for now, because castle chasm looks better than regular chasm, but eventually need dedicated images
|
||||
{TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*,Xo*) Qx* -89 transition2 chasm/regular-castle}
|
||||
# {TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*,Xo*) Qx* -89 transition2 chasm/regular-castle}
|
||||
# moved it down lower
|
||||
{TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*) Qx* -89 transition2 chasm/regular-castle}
|
||||
{TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*) Ql* -89 transition2 unwalkable/castle-lava-chasm}
|
||||
|
||||
# Special Mountain to Chasm Blend transition
|
||||
|
|
@ -772,22 +777,23 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
|
|||
|
||||
#chasm/lava transitions always below castles/walls
|
||||
|
||||
{WALL_TRANSITION2_LF Ql Qx*,Xv,_off^_usr (!,Ql,Qx*,I*r) -90 ground unwalkable/lava-chasm}
|
||||
{WALL_TRANSITION2_LF Qlf Qx*,Xv,_off^_usr (!,Ql*,Qx*,I*r) -90 ground unwalkable/lava-chasm}
|
||||
{WALL_TRANSITION_LF Ql (!,I*r,Ql,Xv,_off^_usr) -90 ground unwalkable/lava}
|
||||
{WALL_TRANSITION_LF Qlf (!,I*r,Qlf,Xv,_off^_usr) -90 ground unwalkable/lava-high}
|
||||
{WALL_TRANSITION2_LF Ql Qx*,Xv,_off^_usr (!,Ql,Qx*,I*r,Xo*) -90 ground unwalkable/lava-chasm}
|
||||
{WALL_TRANSITION2_LF Qlf Qx*,Xv,_off^_usr (!,Ql*,Qx*,I*r,Xo*) -90 ground unwalkable/lava-chasm}
|
||||
{WALL_TRANSITION_LF Ql (!,I*r,Xo*,Ql,Xv,_off^_usr) -90 ground unwalkable/lava}
|
||||
{WALL_TRANSITION_LF Qlf (!,I*r,Xo*,Qlf,Xv,_off^_usr) -90 ground unwalkable/lava-high}
|
||||
{WALL_TRANSITION_LF Qx* (Ai*,Aa*,Ha*,Ms*,) -90 ground chasm/regular-snow}
|
||||
{WALL_TRANSITION_LF Qx* (W*,S*) -90 ground chasm/water}
|
||||
{WALL_TRANSITION_LF Qxe (!,I*r,Qx*,Xv,_off^_usr) -90 ground chasm/earthy}
|
||||
{WALL_TRANSITION_LF Qx* (!,I*r,Qx*,Xv,_off^_usr) -90 ground chasm/regular}
|
||||
{WALL_TRANSITION_LF Qxe (!,Xo*,I*r,Qx*,Xv,_off^_usr) -90 ground chasm/earthy}
|
||||
{WALL_TRANSITION_LF Qx* (!,Xo*,I*r,Qx*,Xv,_off^_usr) -90 ground chasm/regular}
|
||||
|
||||
# to put these lower than wooden floor
|
||||
{WALL_TRANSITION2_LF Qlf Qx*,Xv,_off^_usr (I*r) -290 ground unwalkable/lava-chasm}
|
||||
{WALL_TRANSITION2_LF Ql Qx*,Xv,_off^_usr (I*r) -290 ground unwalkable/lava-chasm}
|
||||
{WALL_TRANSITION_LF Ql (I*r) -290 ground unwalkable/lava}
|
||||
{WALL_TRANSITION_LF Qlf (I*r) -290 ground unwalkable/lava-high}
|
||||
{WALL_TRANSITION_LF Qxe (I*r) -290 ground chasm/earthy}
|
||||
{WALL_TRANSITION_LF Qx* (I*r) -290 ground chasm/regular}
|
||||
{TRANSITION_COMPLETE_LF (Xo*) Qx* -289 transition2 chasm/regular-castle}
|
||||
{WALL_TRANSITION2_LF Qlf Qx*,Xv,_off^_usr (I*r,Xo*) -290 ground unwalkable/lava-chasm}
|
||||
{WALL_TRANSITION2_LF Ql Qx*,Xv,_off^_usr (I*r,Xo*) -290 ground unwalkable/lava-chasm}
|
||||
{WALL_TRANSITION_LF Ql (I*r,Xo*) -290 ground unwalkable/lava}
|
||||
{WALL_TRANSITION_LF Qlf (I*r,Xo*) -290 ground unwalkable/lava-high}
|
||||
{WALL_TRANSITION_LF Qxe (I*r,Xo*) -290 ground chasm/earthy}
|
||||
{WALL_TRANSITION_LF Qx* (I*r,Xo*) -290 ground chasm/regular}
|
||||
|
||||
|
||||
# Stone wall transitions
|
||||
|
|
|
|||
|
|
@ -1181,6 +1181,17 @@ Most units have about 50% defense in rocky caves, whereas cavalry are limited to
|
|||
editor_group=cave,obstacle
|
||||
[/terrain_type]
|
||||
|
||||
[terrain_type]
|
||||
symbol_image=void/void
|
||||
editor_image=walls/stone/clean/wall-stone-tile
|
||||
id=wall_stone_clean
|
||||
name= _ "Stone Wall"
|
||||
editor_name= _ "Clean Stone Wall"
|
||||
string=Xoc
|
||||
aliasof=Xt
|
||||
editor_group=cave,obstacle
|
||||
[/terrain_type]
|
||||
|
||||
#
|
||||
# ## Doors and gates ##
|
||||
#
|
||||
|
|
|
|||