Merge branch 'master' of github.com:wesnoth/wesnoth-old
This commit is contained in:
Alexander van Gessel
commit
e9f4fd8766
5 changed files with 146 additions and 75 deletions
|
|
@ -1,35 +1,35 @@
|
|||
border_size=1
|
||||
usage=map
|
||||
|
||||
Aa , Aa , Ha , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Aa^Fpa , Aa , Ha^Fpa , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Aa^Fpa , Ha^Fpa , Ha^Fpa , Ha^Fpa , Ha , Mm , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Aa , Aa^Fpa , Aa^Fpa , Ha , Aa , Ha , Ha , Mm , Mm , Mm , Ha , Mm , Mm , Mm , Ha , Ha , Ha^Fpa , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Aa , Aa , Aa^Fpa , Aa^Fpa , Aa , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ha^Fpa , Ha , Ha^Voa , Ha , Ha , Ha , Ha , Ai , Mm , Ai , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ha , Mm , Mm
|
||||
Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa , Aa , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Aa , Ha , Ha , Ha , Ha , Ha , Ha , Ha , Ai , Ai , Ai , Ww , Ai , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ha , Ha , Ha , Ha
|
||||
Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Ha , Ha , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Ha , Ha , Ha , Ww , Ww , Ww , Ww , Ai , Ai , Ha , Ha , Ha , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
|
||||
Gg , Gg , Gg , Gg , Gg , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Aa , Ha , Ha , Ha^Vca , Ha , Ww , Ww , Ai , Ww , Ai , Ha , Ha , Ha , Ha , Mm , Ha , Mm , Ha , Mm , Mm , Mm , Ha , Ha
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gg , Aa , Gg , Aa , Gg , Aa , Gg , Gg , Re , Gg , Ha , Gg , Re , Re , Ha , Ai , Ww , Ww , Ha , Ai , Ha , Ha , Ha , Ha , Ha^Fpa , Ha , Ha , Ha , Ha , Mm , Ha , Ha , Ha , Ha
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Re^Gvs , Gg , Re^Gvs , Re , Gg^Vo , Re , Gg , Gg , Re , Gg , Ww , Ww , Ai , Ha , Ha , Ha , Ha , Ha , Aa^Fpa , Ha , Aa^Fpa , Ha^Fpa , Ha , Ha , Ha , Mm , Ha , Ha , Ha , Ha
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Re^Gvs , Re^Gvs , Gs^Fp , Re^Gvs , Gg , Re , Re^Gvs , Re , Re , Re , Hh , Gg , Ww , Ai , Ha , Ha , Ha , Ha , Ha^Fpa , Ha , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ha^Voa , Ha , Ha , Ha^Voa , Mm , Mm , Mm , Mm
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg^Vo , Gg , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Re , Re , Re , Re , Hh , Hh , Ww , Ai , Aa , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa , Ha , Ha , Ha , Ha , Mm , Mm , Mm
|
||||
Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gg^Vo , Gg , Re , Hh , Hh , Ww , Gs^Fp , Gg , Gg , Aa , Ha , Aa , Aa^Fpa , Aa^Fpa , Aa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Aa^Fpa , Ha^Fpa , Aa^Voa , Ha , Ha , Mm , Ha , Ha
|
||||
Gs^Fp , Gs^Fp , Gg^Vo , Gg , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Re^Gvs , Re , Gg , Re , Re , Re , Gg , Re , Gg , Ww , Ww , Gg , Gg , Ha , Gs^Fp , Gs^Fp , Ha^Fpa , Ha , Aa , Ha , Aa^Fpa , Ha , Aa^Fpa , Aa^Fpa , Ha , Ha , Ha , Ha , Ha , Ha , Ha
|
||||
Gg , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Gg , Gs^Fp , Gg , Re , Re , Gg^Vo , Re , Gg , Re , Gg , Gg , Ww , Gg , Gg , Aa , Aa , Gs^Fp , Aa , Ha , Aa , Ha , Aa , Aa , Aa , Aa , Gg , Aa^Fpa , Ha , Ha , Ha , Ha , Aa^Voa , Aa
|
||||
Gg , Gg , Co , Gg , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Re , Gs^Fp , Gg , Gg , Gg , Re , Re , Hh , Hh , Hh , Ww , Gg , Gg , Aa^Voa , Gg , Gg , Aa , Gg^Vc , Aa , Gg , Gg , Gg^Vo , Gg , Gg , Gg , Co , Co , Co , Ha , Ha , Ha
|
||||
Gg , Co , 1 Ko , Co , Gg , Gg^Vo , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Re , Hh , Hh , Hh , Ww , Ww , Gg , Gg , Gg , Gg , Aa , Aa , Gg , Gg , Aa , Gg , Gg , Gg , Gg , Co , Co , 2 Ko , Co , Ha , Ha^Voa , Ha
|
||||
Gg , Co , Co , Co , Re , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Re , Hh , Hh , Hh , Ww , Gg , Re , Gg , Re , Re , Gg , Gg , Gg , Gg , Gg , Gg , Rr , Rr , Rr , Gg , Rr , Rr , Co , Ha , Ha^Fpa , Ha^Fpa
|
||||
Gg , Gg , Gg^Vo , Gg , Gg , Re , Re , Gg , Re , Gs^Fp , Gs^Fp , Gg , Gg^Vo , Re , Hh , Hh , Ww , Ww , Gg , Gg , Re , Re , Re , Gg , Gg , Gg , Gg , Gg , Gg , Rr , Gg , Gg , Gg , Rr , Gg , Gg^Vo , Ha , Ha , Ha^Fpa , Aa^Fpa
|
||||
Gg , Gg , Gg , Gg , Gs^Fp , Gg , Gg , Re , Gg , Re , Re , Gg , Chr , Chr , Gg , Hh , Ww^Bw/ , Gg , Gg , Re , Re , Gg^Vo , Gg , Gg , Hh , Gg , Gg , Gg , Gg , Rr , Gg , Gg , Gg , Gg , Gg , Aa , Aa , Aa , Aa^Fpa , Aa^Fpa
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gg , Re , Chr , Chr , Gg , Chr , Ww , Gg , Gg , Re , Gg , Gg , Co , Co , Gs^Fp , Hh^Fp , Gg , Gg , Rr , Rr , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Aa^Fpa , Ha
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Gg^Vo , Gg , Gg , Gg , Chr , Gg , Gg , Gg , Ww , Ww , Gg , Gg , Gg , Co , Co , Gg , Gs^Fp , Gg , Gg , Rr , Gg , Gg , Gg , Gg , Gg^Vc , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gg
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Co , Gg , Co , Gg , Gg , Gg , Gg , Gg , Hh , Ww , Ww , Gg , Gg , Gg , Gg , Rr , Rr , Gg , Rr , Rr , Gg , Gg , Gg , Gg , Re^Gvs , Re , Re^Gvs , Re^Gvs , Gg^Vo , Gg , Gs^Fp , Gs^Fp
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Co , Co , Re , Gg , Gg , Gg , Gg , Gg , Hh , Hh , Ww , Gg , Hh , Hh , Hh , Gg , Gg , Rr , Gg , Gg , Gs^Fp , Gg , Re , Re^Gvs , Re^Gvs , Re^Gvs , Re^Gvs , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gg , Gg , Re , Gg , Re , Re , Gg , Gg , Gg , Gg , Ww , Gg , Gg , Hh , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Re , Gg , Re , Gg , Re , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Gg , Re , Re , Gg^Vo , Re , Re , Gg , Co , Ww , Gg , Gg , Gg , Ww , Ww , Ww , Gg , Gg , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gs^Fp , Re , Re , Re , Re^Gvs , Re^Gvs , Re , Gg , Re , Gg , Co , Co , Ww , Ww , Ww^Bw\ , Gg , Gg , Gg , Ww , Ww , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Ww , Ww
|
||||
Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Re^Gvs , Re^Gvs , Gg^Vc , Gg , Gg , Co , Ww , Ww , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Ww , Ww , Gg , Gg , Gg^Vo , Gg , Gg , Gg , Gg , Ww , Gs^Fp , Ww , Ww
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh , Gg , Hh , Hh , Hh , Re , Re , Re , Gg , Gg , Ww , Ww , Ww , Gg^Vo , Gg , Gg , Ww^Bw\ , Gg , Gg , Gg , Gg , Ww , Gg , Ww , Ww , Gg , Ww^Bw| , Gg , Ww , Ww , Gg , Ww , Gg^Vo , Gg
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh , Hh^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Ww , Gg , Gg , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Gg , Gg , Gg , Gg , Ww , Gg , Ww , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ww , Ww , Gg , Gg , Gg , Gg , Ww , Ww , Wo , Ww , Ww , Ww , Gg , Gg , Gg , Gg^Vo , Gg , Gg , Gg , Gg , Gg^Vo , Gg , Gg , Gg^Vc , Gg , Gg
|
||||
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ww , Ww , Gg , Gg , Gg , Gg , Ww , Wo , Wo , Wo , Wo , Ww , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg , Gg
|
||||
Aa, Aa, Ha, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa^Fpa, Aa, Ha^Fpa, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa^Fpa, Ha^Fpa, Ha^Fpa, Ha^Fpa, Ha, Mm, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa, Aa^Fpa, Aa^Fpa, Ha, Aa, Ha, Ha, Mm, Mm, Mm, Ha, Mm, Mm, Mm, Ha, Ha, Ha^Fpa, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ha, Ha^Voa, Ha, Ha, Ha, Ha, Ai, Mm, Ai, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Mm, Mm
|
||||
Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Aa, Ha, Ha, Ha, Ha, Ha, Ha, Ha, Ai, Ai, Ai, Ww, Ai, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Ha, Ha, Ha, Ha
|
||||
Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Ha, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Ha, Ha, Ww, Ww, Ww, Ww, Ai, Ai, Ha, Ha, Ha, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm, Mm
|
||||
Gg, Gg, Gg, Gg, Gg, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Ha, Ha, Ha^Vca, Ha, Ww, Ww, Ai, Ww, Ai, Ha, Ha, Ha, Ha, Mm, Ha, Mm, Ha, Mm, Mm, Mm, Ha, Ha
|
||||
Gg, Gg, Gg, Gg, Gg, Gg, Gg, Aa, Gg, Aa, Gg, Aa, Gg, Gg, Re, Gg, Ha, Gg, Re, Re, Ha, Ai, Ww, Ww, Ha, Ai, Ha, Ha, Ha, Ha, Ha^Fpa, Ha, Ha, Ha, Ha, Mm, Ha, Ha, Ha, Ha
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Re^Gvs, Gg, Re^Gvs, Re, Gg^Vo, Re, Gg, Gg, Re, Gg, Ww, Ww, Ai, Ha, Ha, Ha, Ha, Ha, Aa^Fpa, Ha, Aa^Fpa, Ha^Fpa, Ha, Ha, Ha, Mm, Ha, Ha, Ha, Ha
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Re^Gvs, Re^Gvs, Gs^Fp, Re^Gvs, Gg, Re, Re^Gvs, Re, Re, Re, Hh, Gg, Ww, Ai, Ha, Ha, Ha, Ha, Ha^Fpa, Ha, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Voa, Ha, Ha, Ha^Voa, Mm, Mm, Mm, Mm
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg^Vo, Gg, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Re, Re, Re, Re, Hh, Hh, Ww, Ai, Aa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Ha, Ha, Ha, Ha, Mm, Mm, Mm
|
||||
Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gg^Vo, Gg, Re, Hh, Hh, Ww, Gs^Fp, Gg, Gg, Aa, Ha, Aa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa^Voa, Ha, Ha, Mm, Ha, Ha
|
||||
Gs^Fp, Gs^Fp, Gg^Vo, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Re^Gvs, Re, Gg, Re, Re, Re, Gg, Re, Gg, Ww, Ww, Gg, Gg, Ha, Gs^Fp, Gs^Fp, Ha^Fpa, Ha, Aa, Ha, Aa^Fpa, Ha, Aa^Fpa, Aa^Fpa, Ha, Ha, Ha, Ha, Ha, Ha, Ha
|
||||
Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gs^Fp, Gg, Re, Re, Gg^Vo, Re, Gg, Re, Gg, Gg, Wwf, Gg, Gg, Aa, Aa, Gs^Fp, Aa, Ha, Aa, Ha, Aa, Aa, Aa, Aa, Gg, Aa^Fpa, Ha, Ha, Ha, Ha, Aa^Voa, Aa
|
||||
Gg, Gg, Co, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Re, Gs^Fp, Gg, Gg, Gg, Re, Re, Hh, Gg, Hh, Ww, Gg, Gg, Aa^Voa, Gg, Gg, Aa, Gg^Vc, Aa, Gg, Gg, Gg^Vo, Gg, Gg, Gg, Co, Co, Co, Ha, Ha, Ha
|
||||
Gg, Co, 1 Ko, Co, Gg, Gg^Vo, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Re, Hh, Hh, Hh, Ww, Ww, Gg, Gg, Gg, Gg, Aa, Aa, Gg, Gg, Aa, Gg, Gg, Gg, Gg, Co, Co, 2 Ko, Co, Ha, Ha^Voa, Ha
|
||||
Gg, Co, Co, Co, Re, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Re, Hh, Gg, Gg, Ww, Gg, Re, Gg, Re, Re, Gg, Gg, Gg, Gg, Gg, Gg, Rr, Rr, Rr, Gg, Rr, Rr, Co, Ha, Ha^Fpa, Ha^Fpa
|
||||
Gg, Gg, Gg^Vo, Gg, Gg, Re, Re, Gg, Re, Gs^Fp, Gs^Fp, Gg, Gg^Vo, Re, Hh, Hh, Ww, Ww, Gg, Gg, Re, Re, Re, Gg, Gg, Gg, Gg, Gg, Gg, Rr, Gg, Gg, Gg, Rr, Gg, Gg^Vo, Ha, Ha, Ha^Fpa, Aa^Fpa
|
||||
Gg, Gg, Gg, Gg, Gs^Fp, Gg, Gg, Re, Gg, Re, Re, Gg, Chr, Chr, Gg, Gg, Ww^Bw/, Gg, Gg, Re, Re, Gg^Vo, Gg, Gg, Hh, Gg, Gg, Gg, Gg, Rr, Gg, Gg, Gg, Gg, Gg, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Re, Chr, Chr, Gg, Chr, Ww, Gg, Gg, Re, Gg, Gg, Co, Co, Gs^Fp, Hh^Fp, Gg, Gg, Rr, Rr, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Aa^Fpa, Ha
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg^Vo, Gg, Gg, Gg, Chr, Gg, Gg, Gg, Ww, Ww, Gg, Gg, Gg, Co, Co, Gg, Gs^Fp, Gg, Gg, Rr, Gg, Gg, Gg, Gg, Gg^Vc, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Co, Gg, Co, Gg, Gg, Gg, Gg, Gg, Hh, Gg, Ww, Gg, Gg, Gg, Gg, Rr, Rr, Gg, Rr, Rr, Gg, Gg, Gg, Gg, Re^Gvs, Re, Re^Gvs, Re^Gvs, Gg^Vo, Gg, Gs^Fp, Gs^Fp
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Co, Co, Re, Gg, Gg, Gg, Gg, Gg, Hh, Hh, Ww, Ww, Hh, Hh, Hh, Gg, Gg, Rr, Gg, Gg, Gs^Fp, Gg, Re, Re^Gvs, Re^Gvs, Re^Gvs, Re^Gvs, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gg, Gg, Re, Gg, Re, Re, Gg, Gg, Gg, Gg, Wwf, Ww, Gg, Hh, Gg, Ww, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Re, Gg, Re, Gg, Re, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Re, Re, Gg^Vo, Re, Re, Gg, Gg, Ww, Gg, Gg, Gg, Ww, Ww, Ww, Gg, Gg, Gs^Fp, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Gg, Gs^Fp, Re, Re, Re, Re^Gvs, Re^Gvs, Re, Gg, Re, Gg, Co, Co, Wwf, Ww, Ww^Bw\, Gg, Gg, Gg, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww
|
||||
Gs^Fp, Gs^Fp, Gg, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gg, Re^Gvs, Re^Gvs, Gg^Vc, Gg, Gg, Co, Ww, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Ww, Ww, Gg, Gg, Gg^Vo, Gg, Gg, Gg, Gg, Ww, Gs^Fp, Ww, Ww
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Gg, Hh, Hh, Hh, Re, Re, Re, Gg, Gg, Ww, Ww, Ww, Gg^Vo, Gg, Gg, Ww^Bw\, Gg, Gg, Gg, Gg, Ww, Gg, Ww, Ww, Gg, Ww^Bw|, Gg, Ww, Ww, Gg, Ww, Gg^Vo, Gg
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh^Fp, Hh^Fp, Hh^Fp, Hh, Hh^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Ww, Gg, Gg, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gg, Gg, Gg, Gg, Ww, Gg, Ww, Gg, Gg, Gg, Gg, Gg, Gg
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gg, Gg, Gg, Gg, Ww, Ww, Wo, Ww, Ww, Ww, Gg, Gg, Gg, Gg^Vo, Gg, Gg, Gg, Gg, Gg^Vo, Gg, Gg, Gg^Vc, Gg, Gg
|
||||
Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gg, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Ww, Ww, Gg, Gg, Gg, Gg, Ww, Wo, Wo, Wo, Wo, Ww, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg, Gg
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
controller=human
|
||||
team_name=Kapoue
|
||||
user_team_name=_ "Kapou’e"
|
||||
gold=100
|
||||
gold=200
|
||||
{BLACK_FLAG}
|
||||
[/side]
|
||||
|
||||
|
|
@ -68,12 +68,22 @@
|
|||
facing=sw
|
||||
[ai]
|
||||
aggression=1.0
|
||||
[aspect]
|
||||
id=recruitment_save_gold
|
||||
[facet]
|
||||
[value]
|
||||
active=0
|
||||
[/value]
|
||||
[/facet]
|
||||
[/aspect]
|
||||
[/ai]
|
||||
recruit=Ogre, Orcish Grunt, Orcish Warrior, Orcish Crossbowman, Orcish Assassin, Wolf Rider
|
||||
{GOLD 400 500 600}
|
||||
[/side]
|
||||
|
||||
{STARTING_VILLAGES 2 23}
|
||||
{STARTING_VILLAGES 2 28}
|
||||
{AI_FORCE_ATTACK_HIGH_XP_UNITS_SETUP}
|
||||
{AI_FORCE_ATTACK_HIGH_XP_UNITS 2}
|
||||
|
||||
[story]
|
||||
[part]
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@
|
|||
[goal]
|
||||
name=target
|
||||
[criteria]
|
||||
type=Saurian
|
||||
race=lizard
|
||||
[/criteria]
|
||||
value=50
|
||||
[/goal]
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
[goal]
|
||||
name=target
|
||||
[criteria]
|
||||
type=Saurian
|
||||
race=lizard
|
||||
[/criteria]
|
||||
value=50
|
||||
[/goal]
|
||||
|
|
|
|||
|
|
@ -1785,6 +1785,9 @@ def consistency_check():
|
|||
if value not in scenario_to_filename:
|
||||
print '"%s", line %d: unresolved scenario reference %s' % \
|
||||
(filename, lineno, value)
|
||||
# Report stored units never unstored or cleared
|
||||
for store in storedids.keys():
|
||||
print 'wmllint: stored unit "%s" not unstored or cleared from "%s"' % (storedids[store], store)
|
||||
|
||||
# Syntax transformations
|
||||
|
||||
|
|
|
|||
|
|
@ -81,10 +81,77 @@ def get_info(addon):
|
|||
options.data_dir, no_preprocess = False)
|
||||
parser.parse_file(path)
|
||||
_info[addon] = parser
|
||||
else:
|
||||
print("Cannot find " + path)
|
||||
except wmlparser2.WMLError as e:
|
||||
print(e)
|
||||
return _info[addon]
|
||||
|
||||
_deps = {}
|
||||
global_addons = set()
|
||||
def get_dependencies(addon):
|
||||
global _deps
|
||||
global global_addons
|
||||
if addon in _deps:
|
||||
return _deps[addon]
|
||||
_deps[addon] = []
|
||||
try:
|
||||
info = get_info(addon).get_all(tag = "info")[0]
|
||||
row = info.get_text_val("dependencies")
|
||||
if row:
|
||||
deps1 = row.split(",")
|
||||
else:
|
||||
deps1 = []
|
||||
for d in deps1:
|
||||
if d in global_addons:
|
||||
_deps[addon].append(d)
|
||||
else:
|
||||
print("Missing dependency for " + addon + ": " + d)
|
||||
except Exception as e:
|
||||
print(e)
|
||||
return _deps[addon]
|
||||
|
||||
def set_dependencies(addon, depends_on):
|
||||
_deps[addon] = depends_on
|
||||
|
||||
def get_all_dependencies(addon):
|
||||
result = []
|
||||
check = get_dependencies(addon)[:]
|
||||
while check:
|
||||
d = check.pop()
|
||||
if d == addon: continue
|
||||
if d in result: continue
|
||||
result.append(d)
|
||||
check += get_dependencies(d)
|
||||
return result
|
||||
|
||||
def sorted_by_dependencies(addons):
|
||||
sorted = []
|
||||
unsorted = addons[:]
|
||||
while unsorted:
|
||||
n = 0
|
||||
for addon in unsorted:
|
||||
for d in get_dependencies(addon):
|
||||
if d not in sorted:
|
||||
break
|
||||
else:
|
||||
sorted.append(addon)
|
||||
unsorted.remove(addon)
|
||||
n += 1
|
||||
continue
|
||||
if n == 0:
|
||||
print("Cannot sort dependencies for these addons: " + str(unsorted))
|
||||
sorted += unsorted
|
||||
break
|
||||
return sorted
|
||||
|
||||
def search(batchlist, name):
|
||||
for info in batchlist:
|
||||
if info and info["name"] == name: return info
|
||||
batchlist.append({})
|
||||
batchlist[-1]["name"] = name
|
||||
return batchlist[-1]
|
||||
|
||||
def list_contents():
|
||||
class Empty: pass
|
||||
local = Empty()
|
||||
|
|
@ -114,21 +181,29 @@ def list_contents():
|
|||
if t != info[-1]["name"]:
|
||||
info[-1]["translations"][isocode] = t
|
||||
|
||||
def list_eras(addon):
|
||||
def get_dependency_eras(batchlist, addon):
|
||||
dependency_eras = list(mainline_eras)
|
||||
for d in get_all_dependencies(addon):
|
||||
dinfo = search(batchlist, d)
|
||||
for era in dinfo["eras"]:
|
||||
dependency_eras.append(era["id"])
|
||||
return dependency_eras
|
||||
|
||||
def list_eras(batchlist, addon):
|
||||
eras = local.wesnoth.parser.get_all(tag = "era")
|
||||
if addon != "mainline":
|
||||
eras = [x for x in eras if not x.get_text_val("id") in mainline_eras]
|
||||
dependency_eras = get_dependency_eras(batchlist, addon)
|
||||
eras = [x for x in eras if not x.get_text_val("id") in dependency_eras]
|
||||
info = []
|
||||
for era in eras:
|
||||
eid = era.get_text_val("id")
|
||||
if addon == "mainline":
|
||||
mainline_eras.add(eid)
|
||||
append(info, eid, "MULTIPLAYER", c = era)
|
||||
|
||||
|
||||
return info
|
||||
|
||||
def list_campaigns(addon):
|
||||
def list_campaigns(batchlist, addon):
|
||||
campaigns = local.wesnoth.parser.get_all(tag = "campaign")
|
||||
info = []
|
||||
|
||||
|
|
@ -182,60 +257,38 @@ def list_contents():
|
|||
batchlist = yaml.load(open(options.list))
|
||||
except IOError:
|
||||
batchlist = []
|
||||
|
||||
def search(name):
|
||||
for info in batchlist:
|
||||
if info and info["name"] == name: return info
|
||||
batchlist.append({})
|
||||
batchlist[-1]["name"] = name
|
||||
return batchlist[-1]
|
||||
|
||||
print("mainline")
|
||||
|
||||
info = search("mainline")
|
||||
info = search(batchlist, "mainline")
|
||||
info["version"] = "mainline"
|
||||
info["parsed"] = "false"
|
||||
|
||||
parse("{core}{multiplayer/eras.cfg}", "SKIP_CORE")
|
||||
info["eras"] = list_eras("mainline")
|
||||
info["eras"] = list_eras(batchlist, "mainline")
|
||||
|
||||
# Fake mainline campaign to have an overview of the mainline units
|
||||
info["campaigns"] = []
|
||||
append(info["campaigns"], "mainline", "", name = "Units", domain = "wesnoth-help")
|
||||
|
||||
if not options.addons_only:
|
||||
|
||||
parse("{core}{campaigns}", "SKIP_CORE")
|
||||
info["campaigns"] += list_campaigns("mainline")
|
||||
info["campaigns"] += list_campaigns(batchlist, "mainline")
|
||||
|
||||
addons = []
|
||||
if options.addons:
|
||||
addons = os.listdir(options.addons)
|
||||
global global_addons
|
||||
global_addons = set(addons)
|
||||
|
||||
_deps = [{}]
|
||||
def get_dependencies(addon):
|
||||
if addon in _deps[0]:
|
||||
return _deps[0][addon]
|
||||
_deps[0][addon] = []
|
||||
try:
|
||||
info = get_info(addon).get_all(tag = "info")[0]
|
||||
row = info.get_text_val("dependencies")
|
||||
if row:
|
||||
deps1 = row.split(",")
|
||||
else:
|
||||
deps = []
|
||||
for d in deps1:
|
||||
if d in addons:
|
||||
_deps[0][addon].append(d)
|
||||
else:
|
||||
print("Missing dependency for " + addon + ": " + d)
|
||||
except Exception as e:
|
||||
pass
|
||||
return _deps[0][addon]
|
||||
|
||||
# fill in the map for all dependencies
|
||||
for addon in addons:
|
||||
get_dependencies(addon)
|
||||
|
||||
# this ensures that info about eras in dependant addons is available
|
||||
# already
|
||||
addons = sorted_by_dependencies(addons)
|
||||
|
||||
for i, addon in enumerate(addons):
|
||||
if not os.path.isdir(options.addons + "/" + addon): continue
|
||||
sys.stdout.write("%4d/%4d " % (1 + i, len(addons)) + addon + " ... ")
|
||||
|
|
@ -249,7 +302,7 @@ def list_contents():
|
|||
for d in get_dependencies(addon):
|
||||
move(options.addons, options.config_dir + "/data/add-ons", d)
|
||||
try:
|
||||
info = search(addon)
|
||||
info = search(batchlist, addon)
|
||||
|
||||
if info.get("version", "") == version and info.get("parsed", False) == True:
|
||||
sys.stdout.write("up to date\n")
|
||||
|
|
@ -257,8 +310,8 @@ def list_contents():
|
|||
info["parsed"] = False
|
||||
|
||||
parse("{core}{multiplayer}{~add-ons}", "MULTIPLAYER,SKIP_CORE")
|
||||
info["eras"] = list_eras(addon)
|
||||
info["campaigns"] = list_campaigns(addon)
|
||||
info["eras"] = list_eras(batchlist, addon)
|
||||
info["campaigns"] = list_campaigns(batchlist, addon)
|
||||
info["version"] = version
|
||||
info["dependencies"] = get_dependencies(addon)
|
||||
sys.stdout.write("ok\n")
|
||||
|
|
@ -363,6 +416,11 @@ def process_campaign_or_era(addon, cid, define, batchlist):
|
|||
|
||||
def batch_process():
|
||||
batchlist = yaml.load(open(options.batch))
|
||||
|
||||
for addon in batchlist:
|
||||
name = addon["name"]
|
||||
set_dependencies(name, addon.get("dependencies", []))
|
||||
|
||||
for addon in batchlist:
|
||||
name = addon["name"]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue