diff --git a/data/core/images/terrain/village/desert-night.png b/data/core/images/terrain/village/desert-night.png new file mode 100644 index 000000000000..57cee6791e04 Binary files /dev/null and b/data/core/images/terrain/village/desert-night.png differ diff --git a/data/core/images/terrain/village/desert2-night.png b/data/core/images/terrain/village/desert2-night.png new file mode 100644 index 000000000000..72294a0d820b Binary files /dev/null and b/data/core/images/terrain/village/desert2-night.png differ diff --git a/data/core/images/terrain/village/desert3-night.png b/data/core/images/terrain/village/desert3-night.png new file mode 100644 index 000000000000..814517bd33ea Binary files /dev/null and b/data/core/images/terrain/village/desert3-night.png differ diff --git a/data/core/images/terrain/village/desert4-night.png b/data/core/images/terrain/village/desert4-night.png new file mode 100644 index 000000000000..41d52644738b Binary files /dev/null and b/data/core/images/terrain/village/desert4-night.png differ diff --git a/data/core/images/terrain/village/desert5-night.png b/data/core/images/terrain/village/desert5-night.png new file mode 100644 index 000000000000..b7c25020b5a1 Binary files /dev/null and b/data/core/images/terrain/village/desert5-night.png differ diff --git a/data/core/images/terrain/village/desert6-night.png b/data/core/images/terrain/village/desert6-night.png new file mode 100644 index 000000000000..5fa8080a274a Binary files /dev/null and b/data/core/images/terrain/village/desert6-night.png differ diff --git a/data/core/images/terrain/village/desert7-night.png b/data/core/images/terrain/village/desert7-night.png new file mode 100644 index 000000000000..ce6fb41eca4b Binary files /dev/null and b/data/core/images/terrain/village/desert7-night.png differ diff --git a/data/core/images/terrain/village/elven-night.png b/data/core/images/terrain/village/elven-night.png new file mode 100644 index 000000000000..648ea54a7bf2 Binary files /dev/null and b/data/core/images/terrain/village/elven-night.png differ diff --git a/data/core/images/terrain/village/elven2-night.png b/data/core/images/terrain/village/elven2-night.png new file mode 100644 index 000000000000..db92578b3d86 Binary files /dev/null and b/data/core/images/terrain/village/elven2-night.png differ diff --git a/data/core/images/terrain/village/elven3-night.png b/data/core/images/terrain/village/elven3-night.png new file mode 100644 index 000000000000..16a04fed2b2b Binary files /dev/null and b/data/core/images/terrain/village/elven3-night.png differ diff --git a/data/core/images/terrain/village/elven4-night.png b/data/core/images/terrain/village/elven4-night.png new file mode 100644 index 000000000000..8e0cd98d8f85 Binary files /dev/null and b/data/core/images/terrain/village/elven4-night.png differ diff --git a/data/core/images/terrain/village/human-city-night.png b/data/core/images/terrain/village/human-city-night.png new file mode 100644 index 000000000000..15de2cc2a0fc Binary files /dev/null and b/data/core/images/terrain/village/human-city-night.png differ diff --git a/data/core/images/terrain/village/human-city2-night.png b/data/core/images/terrain/village/human-city2-night.png new file mode 100644 index 000000000000..34a719939ea3 Binary files /dev/null and b/data/core/images/terrain/village/human-city2-night.png differ diff --git a/data/core/images/terrain/village/human-city3-night.png b/data/core/images/terrain/village/human-city3-night.png new file mode 100644 index 000000000000..555e3b6c80fc Binary files /dev/null and b/data/core/images/terrain/village/human-city3-night.png differ diff --git a/data/core/images/terrain/village/human-city4-night.png b/data/core/images/terrain/village/human-city4-night.png new file mode 100644 index 000000000000..9b95eb462ed1 Binary files /dev/null and b/data/core/images/terrain/village/human-city4-night.png differ diff --git a/data/core/images/terrain/village/human-cottage-ruin3.png b/data/core/images/terrain/village/human-cottage-ruin3.png index 5a185f83c517..8bc46b3d7622 100644 Binary files a/data/core/images/terrain/village/human-cottage-ruin3.png and b/data/core/images/terrain/village/human-cottage-ruin3.png differ diff --git a/data/core/images/terrain/village/human-night.png b/data/core/images/terrain/village/human-night.png new file mode 100644 index 000000000000..7f84e14f8adb Binary files /dev/null and b/data/core/images/terrain/village/human-night.png differ diff --git a/data/core/images/terrain/village/human2-night.png b/data/core/images/terrain/village/human2-night.png new file mode 100644 index 000000000000..4c26f97717d9 Binary files /dev/null and b/data/core/images/terrain/village/human2-night.png differ diff --git a/data/core/images/terrain/village/human3-night.png b/data/core/images/terrain/village/human3-night.png new file mode 100644 index 000000000000..a0ee5b018d7a Binary files /dev/null and b/data/core/images/terrain/village/human3-night.png differ diff --git a/data/core/images/terrain/village/human3.png b/data/core/images/terrain/village/human3.png index 383735ef87bf..b341f70038f8 100644 Binary files a/data/core/images/terrain/village/human3.png and b/data/core/images/terrain/village/human3.png differ diff --git a/data/core/images/terrain/village/human4-night.png b/data/core/images/terrain/village/human4-night.png new file mode 100644 index 000000000000..cf176c76a333 Binary files /dev/null and b/data/core/images/terrain/village/human4-night.png differ diff --git a/data/core/images/terrain/village/hut-night.png b/data/core/images/terrain/village/hut-night.png new file mode 100644 index 000000000000..8b9a9a0691f2 Binary files /dev/null and b/data/core/images/terrain/village/hut-night.png differ diff --git a/data/core/images/terrain/village/hut.png b/data/core/images/terrain/village/hut.png index 40741b06e9d9..6a8ec1219aeb 100644 Binary files a/data/core/images/terrain/village/hut.png and b/data/core/images/terrain/village/hut.png differ diff --git a/data/core/images/terrain/village/hut2-night.png b/data/core/images/terrain/village/hut2-night.png new file mode 100644 index 000000000000..f9d4ee92106b Binary files /dev/null and b/data/core/images/terrain/village/hut2-night.png differ diff --git a/data/core/images/terrain/village/hut2.png b/data/core/images/terrain/village/hut2.png index 63061c27b069..8caea694bac5 100644 Binary files a/data/core/images/terrain/village/hut2.png and b/data/core/images/terrain/village/hut2.png differ diff --git a/data/core/images/terrain/village/hut3-night.png b/data/core/images/terrain/village/hut3-night.png new file mode 100644 index 000000000000..82a67aa1a2c8 Binary files /dev/null and b/data/core/images/terrain/village/hut3-night.png differ diff --git a/data/core/images/terrain/village/hut3.png b/data/core/images/terrain/village/hut3.png new file mode 100644 index 000000000000..905cc6aced05 Binary files /dev/null and b/data/core/images/terrain/village/hut3.png differ diff --git a/data/core/images/terrain/village/hut4-night.png b/data/core/images/terrain/village/hut4-night.png new file mode 100644 index 000000000000..ad3ce1921cc3 Binary files /dev/null and b/data/core/images/terrain/village/hut4-night.png differ diff --git a/data/core/images/terrain/village/hut4.png b/data/core/images/terrain/village/hut4.png new file mode 100644 index 000000000000..e4ce1e7fb85c Binary files /dev/null and b/data/core/images/terrain/village/hut4.png differ diff --git a/data/core/images/terrain/village/log-cabin-night.png b/data/core/images/terrain/village/log-cabin-night.png new file mode 100644 index 000000000000..d008212edfc0 Binary files /dev/null and b/data/core/images/terrain/village/log-cabin-night.png differ diff --git a/data/core/images/terrain/village/log-cabin2-night.png b/data/core/images/terrain/village/log-cabin2-night.png new file mode 100644 index 000000000000..3ff25ede5819 Binary files /dev/null and b/data/core/images/terrain/village/log-cabin2-night.png differ diff --git a/data/core/images/terrain/village/log-cabin3-night.png b/data/core/images/terrain/village/log-cabin3-night.png new file mode 100644 index 000000000000..13a4ba466d37 Binary files /dev/null and b/data/core/images/terrain/village/log-cabin3-night.png differ diff --git a/data/core/images/terrain/village/log-cabin4-night.png b/data/core/images/terrain/village/log-cabin4-night.png new file mode 100644 index 000000000000..995e2bd56c45 Binary files /dev/null and b/data/core/images/terrain/village/log-cabin4-night.png differ diff --git a/data/core/images/terrain/village/orc-night.png b/data/core/images/terrain/village/orc-night.png new file mode 100644 index 000000000000..dbad6d5a621a Binary files /dev/null and b/data/core/images/terrain/village/orc-night.png differ diff --git a/data/core/images/terrain/village/orc.png b/data/core/images/terrain/village/orc.png index 4a7956f033c2..f4e3fab6f8c6 100644 Binary files a/data/core/images/terrain/village/orc.png and b/data/core/images/terrain/village/orc.png differ diff --git a/data/core/images/terrain/village/orc2-night.png b/data/core/images/terrain/village/orc2-night.png new file mode 100644 index 000000000000..989b54eddc67 Binary files /dev/null and b/data/core/images/terrain/village/orc2-night.png differ diff --git a/data/core/images/terrain/village/orc3-night.png b/data/core/images/terrain/village/orc3-night.png new file mode 100644 index 000000000000..19cee5b6a49e Binary files /dev/null and b/data/core/images/terrain/village/orc3-night.png differ diff --git a/data/core/images/terrain/village/orc3.png b/data/core/images/terrain/village/orc3.png index 3e54cc7e02bf..1a7758cb7f81 100644 Binary files a/data/core/images/terrain/village/orc3.png and b/data/core/images/terrain/village/orc3.png differ diff --git a/data/core/images/terrain/village/orc4-night.png b/data/core/images/terrain/village/orc4-night.png new file mode 100644 index 000000000000..6caf765e69f6 Binary files /dev/null and b/data/core/images/terrain/village/orc4-night.png differ diff --git a/data/core/images/terrain/village/orc5-night.png b/data/core/images/terrain/village/orc5-night.png new file mode 100644 index 000000000000..d05b5fd93e28 Binary files /dev/null and b/data/core/images/terrain/village/orc5-night.png differ diff --git a/data/core/images/terrain/village/orc5.png b/data/core/images/terrain/village/orc5.png new file mode 100644 index 000000000000..a8e37aec7f05 Binary files /dev/null and b/data/core/images/terrain/village/orc5.png differ diff --git a/data/core/images/terrain/village/swampwater-night.png b/data/core/images/terrain/village/swampwater-night.png new file mode 100644 index 000000000000..6005b449e205 Binary files /dev/null and b/data/core/images/terrain/village/swampwater-night.png differ diff --git a/data/core/images/terrain/village/swampwater2-night.png b/data/core/images/terrain/village/swampwater2-night.png new file mode 100644 index 000000000000..ba33cad78e42 Binary files /dev/null and b/data/core/images/terrain/village/swampwater2-night.png differ diff --git a/data/core/images/terrain/village/swampwater3-night.png b/data/core/images/terrain/village/swampwater3-night.png new file mode 100644 index 000000000000..392453e3cb33 Binary files /dev/null and b/data/core/images/terrain/village/swampwater3-night.png differ diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg index 5f4fedf340cd..c871dd900904 100644 --- a/data/core/terrain-graphics.cfg +++ b/data/core/terrain-graphics.cfg @@ -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 diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg index 53205fe49201..e880c7b4e74c 100644 --- a/data/core/terrain-graphics/new-macros.cfg +++ b/data/core/terrain-graphics/new-macros.cfg @@ -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]