some night-time village images (#2084)

* some night-time village images

* more variations, and revision to VILLAGE_TOD macro

* lights for swamp villages
This commit is contained in:
doofus-01 2017-10-08 21:27:49 -07:00 committed by GitHub
parent c499d89574
commit 0cce7c8106
46 changed files with 25 additions and 12 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 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.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 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: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

View file

@ -268,6 +268,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
# top of both 'base' and 'overlay'
#Human villages
{NEW:VILLAGE_TOD *^Vh village/human}
{NEW:VILLAGE *^Vh village/human}
{NEW:VILLAGE *^Vha village/human-snow}
{NEW:VILLAGE *^Vhr village/human-cottage-ruin}
@ -276,6 +277,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:VILLAGE *^Vhha village/human-snow-hills}
{NEW:VILLAGE *^Vhhr village/human-hills-ruin}
{NEW:VILLAGE_TOD *^Vhc village/human-city}
{NEW:VILLAGE *^Vhc village/human-city}
{NEW:VILLAGE *^Vhca village/human-city-snow}
{NEW:VILLAGE *^Vhcr village/human-city-ruin}
@ -284,10 +286,12 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:VILLAGE *^Vht village/tropical-forest}
#Crude villages (grassland)
{NEW:VILLAGE *^Vc village/hut}
{NEW:VILLAGE_TOD *^Vc village/hut}
{NEW:VILLAGE *^Vc village/hut}
{NEW:VILLAGE *^Vca village/hut-snow}
{NEW:VILLAGE_TOD *^Vl village/log-cabin}
{NEW:VILLAGE *^Vl village/log-cabin}
{NEW:VILLAGE *^Vla village/log-cabin-snow}
@ -305,16 +309,18 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:VILLAGE *^Vd village/drake5}
#Orcish villages
{NEW:VILLAGE_TOD *^Vo village/orc}
{NEW:VILLAGE *^Vo village/orc}
{NEW:VILLAGE *^Voa village/orc-snow}
#Elven villages
#10% 25% 25% 40%
{NEW:VILLAGE *^Ve village/elven}{VILLAGE_PROBABILITY 10}
{NEW:VILLAGE *^Ve village/elven3}{VILLAGE_PROBABILITY 28}
{NEW:VILLAGE *^Ve village/elven4}{VILLAGE_PROBABILITY 38}
{NEW:VILLAGE *^Ve village/elven2}
{NEW:VILLAGE_TOD *^Ve village/elven}
#{NEW:VILLAGE *^Ve village/elven}{VILLAGE_PROBABILITY 10}
#{NEW:VILLAGE *^Ve village/elven3}{VILLAGE_PROBABILITY 28}
#{NEW:VILLAGE *^Ve village/elven4}{VILLAGE_PROBABILITY 38}
{NEW:VILLAGE *^Ve village/elven}
#10% 25% 25% 40%
{NEW:VILLAGE *^Vea village/elven-snow}{VILLAGE_PROBABILITY 10}
@ -323,6 +329,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:VILLAGE *^Vea village/elven-snow2}
#Desert villages
{NEW:VILLAGE_TOD *^Vda village/desert}
{NEW:VILLAGE *^Vda village/desert}
{NEW:VILLAGE *^Vdr village/desert-ruin}
{NEW:VILLAGE *^Vdt village/desert-camp}
@ -332,6 +339,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:VILLAGE *^Vud village/dwarven}
#Swamp village
{NEW:VILLAGE_TOD *^Vhs village/swampwater}
{NEW:VILLAGE *^Vhs village/swampwater}
#Merfolk village
@ -339,7 +347,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
# {NEW:VILLAGE *^Vm village/coast2}{VILLAGE_PROBABILITY 24}
# {NEW:VILLAGE *^Vm village/coast3}{VILLAGE_PROBABILITY 29}
# {NEW:VILLAGE *^Vm village/coast4}{VILLAGE_PROBABILITY 35}
{NEW:VILLAGE_TOD_P *^Vm 80 village/coast}
{NEW:VILLAGE_TOD *^Vm village/coast}
{NEW:VILLAGE *^Vm village/coast_5-A ANIM=[01~04] TIME=140}
#
@ -787,9 +795,6 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
# 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}
# 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}
@ -808,7 +813,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{WALL_TRANSITION_LF Qxe (!,Qx*,Xv,_off^_usr) -290 ground chasm/earthy}
{WALL_TRANSITION_LF Qx* (!,Qx*,Xv,_off^_usr) -290 ground chasm/regular}
{TRANSITION_COMPLETE_LF (Xo*) Qx* -289 transition2 chasm/regular-castle}
{TRANSITION_COMPLETE_LF (Xo*) Ql -289 transition2 chasm/regular-wall}
{TRANSITION_COMPLETE_LF (Xo*) Qx* -289 transition2 chasm/regular-wall}
# Stone wall transitions

View file

@ -2360,7 +2360,14 @@ X*#endarg
{NEW:VILLAGE {TERRAINLIST} {IMAGESTEM} (ANIM=[01~03]) (TIME={TIME})}
#enddef
#define NEW:VILLAGE_TOD_P TERRAINLIST PROB IMAGESTEM
#define NEW:VILLAGE_TOD TERRAINLIST IMAGESTEM
#arg PROB
25#endarg
#arg TIME
first_watch,dusk,dusk1,dusk2,short_dark,long_dark1,underground#endarg
[terrain_graphics]
map="
, *
@ -2383,7 +2390,7 @@ X*#endarg
base=90,144
center=90,144
[variant]
tod=first_watch,midnight,second_watch,dusk,dusk2,short_dark,long_dark1,long_dark2,long_dark3,long_dark4
tod={TIME}
name={IMAGESTEM}@V-night.png
[/variant]
[/image]