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

Ran wmlindent and fixed badly formatted code

Browse source
This commit is contained in:
Charles Dang 2016-08-05 13:41:30 +11:00
parent 6d298803fa
commit a6dd6c668c
8 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/campaigns/Legend_of_Wesmere/utils/deaths.cfg
View file

@ -113,11 +113,11 @@
upkeep="loyal"
[/filter_wml]
[filter_side]
[allied_with]
[has_unit]
id = "Kalenz"
[/has_unit]
[/allied_with]
[allied_with]
[has_unit]
id = "Kalenz"
[/has_unit]
[/allied_with]
[/filter_side]
[/filter]
[message]

33
data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
View file

@ -311,10 +311,12 @@
[/set_variable]
{NAMED_GENERIC_UNIT 1 "Desert Fighter" 24 25 "Vecnu" ( _ "Vecnu")}
{NAMED_UNIT 1 "Desert Archer" 24 27 "Eranor" ( _ "Eranor") (gender=male
{NAMED_UNIT 1 "Desert Archer" 24 27 "Eranor" ( _ "Eranor") (
gender=male
random_traits,upkeep=yes,full
)}
{NAMED_UNIT 1 "Desert Archer" 21 25 "Seela" ( _ "Seela") (gender=female
{NAMED_UNIT 1 "Desert Archer" 21 25 "Seela" ( _ "Seela") (
gender=female
random_traits,upkeep=yes,full
)}
@ -408,7 +410,8 @@
[/set_variable]
{NAMED_GENERIC_UNIT 1 "Desert Hunter" 24 34 "Eloshi" ( _ "Eloshi")}
{NAMED_UNIT 1 "Desert Archer" 19 33 "Illuvia" ( _ "Illuvia") (gender=female
{NAMED_UNIT 1 "Desert Archer" 19 33 "Illuvia" ( _ "Illuvia") (
gender=female
random_traits,upkeep=yes,full
)}
#ifdef HARD
@ -474,30 +477,37 @@
[/set_variable]
# wmllint: recognize Rocky Horror
{UNIT 2 "Giant Mudcrawler" 34 33 (role="Rocky Horror"
{UNIT 2 "Giant Mudcrawler" 34 33 (
role="Rocky Horror"
generate_name,random_traits,random_gender=yes,no,yes
)}
{UNIT 2 "Giant Mudcrawler" 34 34 (role="Rocky Horror"
{UNIT 2 "Giant Mudcrawler" 34 34 (
role="Rocky Horror"
generate_name,random_traits,random_gender=yes,no,yes
)}
{UNIT 2 "Small Mudcrawler" 34 35 (role="Rocky Horror"
{UNIT 2 "Small Mudcrawler" 34 35 (
role="Rocky Horror"
generate_name,random_traits,random_gender=yes,no,yes
)}
#ifdef HARD
{UNIT 2 "Giant Mudcrawler" 35 33 (role="Rocky Horror"
{UNIT 2 "Giant Mudcrawler" 35 33 (
role="Rocky Horror"
generate_name,random_traits,random_gender=yes,no,yes
)}
#else
{UNIT 2 "Small Mudcrawler" 35 33 (role="Rocky Horror"
{UNIT 2 "Small Mudcrawler" 35 33 (
role="Rocky Horror"
generate_name,random_traits,random_gender=yes,no,yes
)}
#endif
#ifdef EASY
{UNIT 2 "Small Mudcrawler" 36 32 (role="Rocky Horror"
{UNIT 2 "Small Mudcrawler" 36 32 (
role="Rocky Horror"
generate_name,random_traits,random_gender=yes,no,yes
)}
#else
{UNIT 2 "Giant Mudcrawler" 36 32 (role="Rocky Horror"
{UNIT 2 "Giant Mudcrawler" 36 32 (
role="Rocky Horror"
generate_name,random_traits,random_gender=yes,no,yes
)}
#endif
@ -511,7 +521,8 @@
[/unit]
{NAMED_GENERIC_UNIT 1 "Desert Fighter" 36 33 "Jorazan" ( _ "Jorazan")}
{NAMED_UNIT 1 "Desert Fighter" 35 34 "Zyara" ( _ "Zyara") (gender=female
{NAMED_UNIT 1 "Desert Fighter" 35 34 "Zyara" ( _ "Zyara") (
gender=female
random_traits,upkeep=yes,full
)}

2
data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
View file

@ -215,7 +215,7 @@
# [message]speaker=narrator deselects the unit, so reselect it now
[select_unit]
id=student
id=student
[/select_unit]
{GENDER (

12
data/core/about.cfg
View file

@ -1093,7 +1093,7 @@
name = "FAAB"
[/entry]
[entry]
name = "Federico Pasco (neverEnough)"
name = "Federico Pasco (neverEnough)"
[/entry]
[entry]
name = "Fedor Khod'kov (teddy/fkhodkov)"
@ -1324,7 +1324,7 @@
wikiuser = "Pauxlo"
[/entry]
[entry]
name = "Pentarctagon"
name = "Pentarctagon"
[/entry]
[entry]
name = "Peter Elmers"
@ -1363,7 +1363,7 @@
comment = "2012 Google Code-in Students' Micro AI development"
[/entry]
[entry]
name = "Robert Wallace (Robertdebrus)"
name = "Robert Wallace (Robertdebrus)"
[/entry]
[entry]
name = "Rocco J Carello (rogue)"
@ -1547,8 +1547,8 @@
[about]
title = _"Asturian Translation" # wmllint: no spellcheck
# [entry]
# [/entry]
# [entry]
# [/entry]
[/about]
[about]
@ -2712,7 +2712,7 @@
[/entry]
[entry]
name = "Kamil Matuszewski (LiamTailor)"
comment = "Current coordinator"
comment = "Current coordinator"
[/entry]
[entry]
name = "Karol Nowak (grzywacz)"

4
data/core/macros/names.cfg
View file

@ -32,7 +32,7 @@ short_name=Mal|Ka|Emth|Dar|Eshi
#enddef
#define DWARVISH_NAMES
male_names= _ "Aigaithas,Aigaithil,Aigaithing,Aigaithol,Aigalas,Aigaling,Aigalis,Aigalol,Aigalsil,Aigatas,Aigatis,Aigatlos,Aigatsil,Aigatsol,Aigatus,Aigcatas,Aigcatil,Aigcating,Aigcatis,Aigcatsil,Aigcatsol,Aigcatus,Aigdring,Aigdris,Aigdrlos,Aigdrsil,Aigdrsol,Aigduras,Aigdurlos,Aigdursol,Aigthaing,Aigthais,Aigthasil,Aigthaus,Alaithas,Alaithis,Alaithlos,Alaithol,Alaithsol,Alaithus,Alalas,Alalil,Alalol,Alalsol,Alalus,Alatas,Alatil,Alating,Alatlos,Alatsil,Alcatil,Alcatis,Alcatlos,Alcatsil,Aldras,Aldril,Aldring,Aldris,Aldrlos,Aldrol,Aldrsol,Alduras,Aldurlos,Aldurol,Althaas,Althail,Althalos,Althaol,Althasil,Althasol,Althaus,Anaithas,Anaithil,Anaithing,Anaithis,Anaithsil,Anaithus,Analil,Anallos,Analol,Analsil,Analus,Anatas,Anating,Anatis,Anatol,Anatsol,Ancatas,Ancatil,Ancatol,Ancatus,Andril,Andris,Andrlos,Andrus,Anduril,Andurol,Andursol,Andurus,Anthaas,Anthaing,Anthais,Anthaol,Anthasil,Anthasol,Anthaus,Augaithas,Augaithing,Augaithsil,Augaithus,Augalas,Augaling,Augalol,Augating,Augatlos,Augatol,Augatsil,Augatsol,Augcatas,Augcatil,Augcatis,Augcatol,Augcatsil,Augcatus,Augdras,Augdris,Augdrsil,Augdrus,Augduras,Augduril,Augduring,Augdurol,Augdursol,Augdurus,Augthail,Augthais,Augthalos,Augthaol,Dulaithil,Dulaithing,Dulaithlos,Dulaithsil,Dulaithsol,Dulalas,Dulaling,Dulalis,Dulalsil,Dulatil,Dulating,Dulatol,Dulatsol,Dulatus,Dulcatil,Dulcating,Dulcatlos,Dulcatol,Dulcatsil,Dulcatsol,Duldril,Duldris,Duldrlos,Duldrol,Duldrsil,Duldrus,Dulduras,Dulduring,Duldursil,Duldurus,Dulthalos,Dulthasil,Dulthasol,Dulthaus,Glamaithil,Glamaithis,Glamaithol,Glamaithsol,Glamalil,Glamaling,Glamalis,Glamallos,Glamalsil,Glamalus,Glamatil,Glamatus,Glamcatas,Glamcatil,Glamcating,Glamcatsil,Glamcatus,Glamdras,Glamdril,Glamdrlos,Glamdrsol,Glamduras,Glamduril,Glamduring,Glamduris,Glamdursol,Glamthaas,Glamthaol,Glamthasil,Glamthasol,Glamthaus,Glomin,Gomaithas,Gomaithil,Gomaithol,Gomaithsol,Gomalil,Gomalis,Gomalus,Gomatas,Gomatil,Gomating,Gomatis,Gomatlos,Gomatol,Gomcatil,Gomcatis,Gomcatlos,Gomdras,Gomdril,Gomdring,Gomdris,Gomdrol,Gomdrsil,Gomduris,Gomdurlos,Gomdursil,Gomdursol,Gomdurus,Gomthaas,Gomthalos,Gomthasol,Naraithil,Naraithing,Naraithol,Naraithsil,Naraithsol,Naraithus,Naralas,Naralil,Naralsil,Naralus,Naratlos,Naratol,Naratsil,Narcating,Narcatis,Narcatol,Narcatsil,Narcatsol,Nardras,Nardril,Nardring,Nardris,Nardrol,Nardrsil,Nardrsol,Nardrus,Narduras,Narduril,Nardurol,Narthalos,Narthaol,Pelaithas,Pelaithil,Pelaithing,Pelaithis,Pelaithlos,Pelaithol,Pelaithsil,Pelaithsol,Pelalil,Pelaling,Pelalis,Pelalsil,Pelalsol,Pelalus,Pelatil,Pelating,Pelatis,Pelatol,Pelatsil,Pelatus,Pelcating,Pelcatlos,Pelcatol,Pelcatsil,Peldras,Peldril,Peldrsol,Peldrus,Pelduril,Pelduring,Pelduris,Peldurol,Peldursol,Peldurus,Pelthaas,Pelthail,Pelthasil,Trithaithas,Trithaithil,Trithaithis,Trithaithlos,Trithaithol,Trithaithsil,Trithaithsol,Trithaithus,Trithalis,Trithalol,Trithatas,Trithatil,Trithatlos,Trithatsol,Trithcatlos,Trithcatsol,Trithcatus,Trithdril,Trithdring,Trithdris,Trithdrlos,Trithdrol,Trithdrsol,Trithdrus,Trithduril,Trithduring,Trithdurlos,Trithdurol,Trithdursil,Trithdurus,Triththaas,Triththail,Triththaing,Triththasol,Triththaus"
male_names= _ "Aigaithas,Aigaithil,Aigaithing,Aigaithol,Aigalas,Aigaling,Aigalis,Aigalol,Aigalsil,Aigatas,Aigatis,Aigatlos,Aigatsil,Aigatsol,Aigatus,Aigcatas,Aigcatil,Aigcating,Aigcatis,Aigcatsil,Aigcatsol,Aigcatus,Aigdring,Aigdris,Aigdrlos,Aigdrsil,Aigdrsol,Aigduras,Aigdurlos,Aigdursol,Aigthaing,Aigthais,Aigthasil,Aigthaus,Alaithas,Alaithis,Alaithlos,Alaithol,Alaithsol,Alaithus,Alalas,Alalil,Alalol,Alalsol,Alalus,Alatas,Alatil,Alating,Alatlos,Alatsil,Alcatil,Alcatis,Alcatlos,Alcatsil,Aldras,Aldril,Aldring,Aldris,Aldrlos,Aldrol,Aldrsol,Alduras,Aldurlos,Aldurol,Althaas,Althail,Althalos,Althaol,Althasil,Althasol,Althaus,Anaithas,Anaithil,Anaithing,Anaithis,Anaithsil,Anaithus,Analil,Anallos,Analol,Analsil,Analus,Anatas,Anating,Anatis,Anatol,Anatsol,Ancatas,Ancatil,Ancatol,Ancatus,Andril,Andris,Andrlos,Andrus,Anduril,Andurol,Andursol,Andurus,Anthaas,Anthaing,Anthais,Anthaol,Anthasil,Anthasol,Anthaus,Augaithas,Augaithing,Augaithsil,Augaithus,Augalas,Augaling,Augalol,Augating,Augatlos,Augatol,Augatsil,Augatsol,Augcatas,Augcatil,Augcatis,Augcatol,Augcatsil,Augcatus,Augdras,Augdris,Augdrsil,Augdrus,Augduras,Augduril,Augduring,Augdurol,Augdursol,Augdurus,Augthail,Augthais,Augthalos,Augthaol,Dulaithil,Dulaithing,Dulaithlos,Dulaithsil,Dulaithsol,Dulalas,Dulaling,Dulalis,Dulalsil,Dulatil,Dulating,Dulatol,Dulatsol,Dulatus,Dulcatil,Dulcating,Dulcatlos,Dulcatol,Dulcatsil,Dulcatsol,Duldril,Duldris,Duldrlos,Duldrol,Duldrsil,Duldrus,Dulduras,Dulduring,Duldursil,Duldurus,Dulthalos,Dulthasil,Dulthasol,Dulthaus,Glamaithil,Glamaithis,Glamaithol,Glamaithsol,Glamalil,Glamaling,Glamalis,Glamallos,Glamalsil,Glamalus,Glamatil,Glamatus,Glamcatas,Glamcatil,Glamcating,Glamcatsil,Glamcatus,Glamdras,Glamdril,Glamdrlos,Glamdrsol,Glamduras,Glamduril,Glamduring,Glamduris,Glamdursol,Glamthaas,Glamthaol,Glamthasil,Glamthasol,Glamthaus,Glomin,Gomaithas,Gomaithil,Gomaithol,Gomaithsol,Gomalil,Gomalis,Gomalus,Gomatas,Gomatil,Gomating,Gomatis,Gomatlos,Gomatol,Gomcatil,Gomcatis,Gomcatlos,Gomdras,Gomdril,Gomdring,Gomdris,Gomdrol,Gomdrsil,Gomduris,Gomdurlos,Gomdursil,Gomdursol,Gomdurus,Gomthaas,Gomthalos,Gomthasol,Naraithil,Naraithing,Naraithol,Naraithsil,Naraithsol,Naraithus,Naralas,Naralil,Naralsil,Naralus,Naratlos,Naratol,Naratsil,Narcating,Narcatis,Narcatol,Narcatsil,Narcatsol,Nardras,Nardril,Nardring,Nardris,Nardrol,Nardrsil,Nardrsol,Nardrus,Narduras,Narduril,Nardurol,Narthalos,Narthaol,Pelaithas,Pelaithil,Pelaithing,Pelaithis,Pelaithlos,Pelaithol,Pelaithsil,Pelaithsol,Pelalil,Pelaling,Pelalis,Pelalsil,Pelalsol,Pelalus,Pelatil,Pelating,Pelatis,Pelatol,Pelatsil,Pelatus,Pelcating,Pelcatlos,Pelcatol,Pelcatsil,Peldras,Peldril,Peldrsol,Peldrus,Pelduril,Pelduring,Pelduris,Peldurol,Peldursol,Peldurus,Pelthaas,Pelthail,Pelthasil,Trithaithas,Trithaithil,Trithaithis,Trithaithlos,Trithaithol,Trithaithsil,Trithaithsol,Trithaithus,Trithalis,Trithalol,Trithatas,Trithatil,Trithatlos,Trithatsol,Trithcatlos,Trithcatsol,Trithcatus,Trithdril,Trithdring,Trithdris,Trithdrlos,Trithdrol,Trithdrsol,Trithdrus,Trithduril,Trithduring,Trithdurlos,Trithdurol,Trithdursil,Trithdurus,Triththaas,Triththail,Triththaing,Triththasol,Triththaus"
name_generator= _ <<
main={long_name}
long_name={prefix}{centre}{suffix}|{prefix}{centre}{centre}{suffix}
@ -142,7 +142,7 @@ suffix=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|zid|riya|ail|
connector= al-| bin | ibn
centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw
>>
female_name_generator= _ <<
female_name_generator= _ <<
main={name_long}|{prefix}{suffix}|{name_mid}{connector}{surname}
name_mid={prefix}{suffix}|{name_short}
surname={name_mid_male}|{name_mid}|{name_mid_male}

4
data/core/macros/traits.cfg
View file

@ -222,7 +222,7 @@ Resilient units can be useful at all stages of a campaign, and this is a useful
male_name= _ "fearless"
female_name= _ "female^fearless"
description= _ "Fights normally during unfavorable times of day/night"
help_text= _ "Aversion to light and dark holds no sway over these brave individuals."
help_text= _ "Aversion to light and dark holds no sway over these brave individuals."
[effect]
apply_to="fearless"
[/effect]
@ -239,7 +239,7 @@ Resilient units can be useful at all stages of a campaign, and this is a useful
male_name= _ "fearless"
female_name= _ "female^fearless"
description= _ "Fights normally during unfavorable times of day/night"
help_text= _ "Aversion to light and dark holds no sway over these brave individuals."
help_text= _ "Aversion to light and dark holds no sway over these brave individuals."
[effect]
apply_to="fearless"
[/effect]

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

@ -10,7 +10,7 @@
x,y=0,0
type={TERRAIN}
set_no_flag=base
[image]
name={IMAGESTEM}@V.png
variations=";2;3;4;5;6;7;8;9;10;11"

2
data/core/terrain.cfg
View file

@ -797,7 +797,7 @@ Most units receive 20 to 40% defense in sand."
name= _ "Mountains"
editor_name= _ "Desert Mountains"
string=Mdd
aliasof=Mt
aliasof=Mt
editor_group=rough, desert
[/terrain_type]