0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issues with NEW:VILLAGE_TOD

Browse source 
Changed the default probability from 25 to 100, because it looks like a bug when only part of villages of the same kind are lit at night. Restored the original probabilities for elven and coast villages, and fixed column alignment for village macro calls.

[ci skip]
This commit is contained in:
ln-zookeeper 2018-03-15 20:32:30 +02:00
parent 75b50979b6
commit 624a407c94
2 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
data/core/terrain-graphics.cfg
View file

@ -268,8 +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_TOD *^Vh village/human}
{NEW:VILLAGE *^Vha village/human-snow}
{NEW:VILLAGE *^Vhr village/human-cottage-ruin}
@ -277,8 +276,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_TOD *^Vhc village/human-city}
{NEW:VILLAGE *^Vhca village/human-city-snow}
{NEW:VILLAGE *^Vhcr village/human-city-ruin}
@ -286,13 +284,11 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{NEW:VILLAGE *^Vht village/tropical-forest}
#Crude villages (grassland)
{NEW:VILLAGE_TOD *^Vc village/hut}
{NEW:VILLAGE *^Vc village/hut}
{NEW:VILLAGE_TOD *^Vc village/hut}
{NEW:VILLAGE *^Vca village/hut-snow}
{NEW:VILLAGE_TOD *^Vl village/log-cabin}
{NEW:VILLAGE *^Vl village/log-cabin}
{NEW:VILLAGE_TOD *^Vl village/log-cabin}
{NEW:VILLAGE *^Vla village/log-cabin-snow}
{NEW:VILLAGE *^Vct village/camp}
@ -302,25 +298,22 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
#Drake villages
#20% 20% 20% 20% 20%
{NEW:VILLAGE *^Vd village/drake1-A PROB=20 ANIM=[01~03] TIME=200}
{NEW:VILLAGE *^Vd village/drake2-A PROB=25 ANIM=[01~03] TIME=100}
{NEW:VILLAGE *^Vd village/drake3 PROB=33}
{NEW:VILLAGE *^Vd village/drake4 PROB=50}
{NEW:VILLAGE *^Vd village/drake5}
{NEW:VILLAGE *^Vd village/drake1-A PROB=20 ANIM=[01~03] TIME=200}
{NEW:VILLAGE *^Vd village/drake2-A PROB=25 ANIM=[01~03] TIME=100}
{NEW:VILLAGE *^Vd village/drake3 PROB=33}
{NEW:VILLAGE *^Vd village/drake4 PROB=50}
{NEW:VILLAGE *^Vd village/drake5}
#Orcish villages
{NEW:VILLAGE_TOD *^Vo village/orc}
{NEW:VILLAGE *^Vo village/orc}
{NEW:VILLAGE_TOD *^Vo village/orc}
{NEW:VILLAGE *^Voa village/orc-snow}
{NEW:VILLAGE *^Voa village/orc-snow}
#Elven villages
#10% 25% 25% 40%
{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}
{NEW:VILLAGE_TOD *^Ve village/elven PROB=10 VARIATIONS=""}
{NEW:VILLAGE_TOD *^Ve village/elven3 PROB=28}
{NEW:VILLAGE_TOD *^Ve village/elven4 PROB=38}
{NEW:VILLAGE_TOD *^Ve village/elven2}
#10% 25% 25% 40%
{NEW:VILLAGE *^Vea village/elven-snow}{VILLAGE_PROBABILITY 10}
@ -329,8 +322,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_TOD *^Vda village/desert}
{NEW:VILLAGE *^Vdr village/desert-ruin}
{NEW:VILLAGE *^Vdt village/desert-camp}
@ -339,15 +331,14 @@ 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}
{NEW:VILLAGE_TOD *^Vhs village/swampwater}
#Merfolk village
# {NEW:VILLAGE *^Vm village/coast}{VILLAGE_PROBABILITY 20}
# {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 *^Vm village/coast}
{NEW:VILLAGE_TOD *^Vm village/coast PROB=80}
{NEW:VILLAGE *^Vm village/coast_5-A ANIM=[01~04] TIME=140}
#

7
data/core/terrain-graphics/new-macros.cfg
View file

@ -3096,7 +3096,10 @@ Xu*,Xo*#endarg
#define NEW:VILLAGE_TOD TERRAINLIST IMAGESTEM
#arg PROB
25#endarg
100#endarg
#arg VARIATIONS
;2;3;4;5;6;7#endarg
#arg TIME
first_watch,dusk,dusk1,dusk2,short_dark,long_dark1,underground#endarg
@ -3118,7 +3121,7 @@ first_watch,dusk,dusk1,dusk2,short_dark,long_dark1,underground#endarg
[image]
name={IMAGESTEM}@V.png
variations=";2;3;4;5;6;7"
variations={VARIATIONS}
layer=0
base=90,144
center=90,144