Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/wesnoth/wesnoth
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbeck88
cbeck88 committed Apr 19, 2014
2 parents 1ef34f4 + c2062ca commit 992ebe1
Show file tree
Hide file tree
Showing 87 changed files with 473 additions and 127 deletions.
14 changes: 11 additions & 3 deletions changelog
View file
Expand Up @@ -13,11 +13,19 @@ Version 1.13.0-dev:
mechanism and applied to other CAs as well, but it was most visible in the
Micro AIs.
* Some internal reorganization of Micro AI code to facilitate customizing
MAIs for UMC and adding functionality from other versions of Wesnoth
them for UMC and adding functionality from other versions of Wesnoth. Some
code cleanup for consistency, readability and speed, as well as fixing of
some minor and subtle bugs.
* Campaigns:
* Changed all occurrences of {FLAG_VARIANT ragged} to {FLAG_VARIANT6 ragged}
* Eastern Invasion:
* In 'Captured', stolen gold won't be mentioned if the player had no
carryover gold.
* Son of the Black Eye: some minor changes
* S2: adjusted starting villages; scenario now ends if Kapou'e is already
on the signpost when the messenger comes back
* S3: make objectives consistent between before and after trolls appear
* S6: remove AI controller. It doesn't work with sides without a leader
* The Hammer of Thursagan:
* Fixed missing objective in 'The Court of Karrag'.
* Rebalanced scenarios 'Invaders', Mages and Drakes' and 'Fear'.
Expand Down Expand Up @@ -90,12 +98,12 @@ Version 1.13.0-dev:
* Changed: Don't use the random generator for units with no names.
* Fix bug #21910: code for game is ready bell is corrected, simplified, and
moved to mp_connect::process_network_data.
* Deliver desktop notifications in tandem with "game is ready" bell and
* Deliver desktop notifications in tandem with "game is ready" bell and
also the "game has begun" bell.
* Disable notifications preference now works in all platforms, not just DBUS.
* Fix bug in which blindfold could cause OOS.
* Fix bug #21914: allow drake walking corpse variation to move on unwalkable
* Fix unnecessary "Mandatory WML Child not found" error when replay file
* Fix unnecessary "Mandatory WML Child not found" error when replay file
doesn't have a [carryover_sides_start] tag
* Server now generates PR 121 compliant replay files.
* Fix bug #21025: replay controller doesn't execute play_next_side properly
Expand Down
6 changes: 3 additions & 3 deletions data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg
View file
Expand Up @@ -98,7 +98,7 @@
{EBESIEGED_RECRUITMENT}
team_name=orcs
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand All @@ -116,7 +116,7 @@
[ai]
{AVOID_CHANTAL}
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand All @@ -134,7 +134,7 @@
[ai]
{AVOID_CHANTAL}
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

#allies of Konrad
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
View file
Expand Up @@ -56,7 +56,7 @@
grouping=offensive
attack_depth=5
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[story]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/An_Orcish_Incursion/scenarios/02_Assassins.cfg
View file
Expand Up @@ -67,7 +67,7 @@
grouping=offensive
attack_depth=5
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

# Gharlsa starts with all villages north of the northernmost river
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg
View file
Expand Up @@ -51,7 +51,7 @@
grouping=offensive
attack_depth=5
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[story]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg
View file
Expand Up @@ -77,7 +77,7 @@
leader_value=3
village_value=1
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 2 9}
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg
View file
Expand Up @@ -91,7 +91,7 @@
grouping="offensive"
attack_depth="5"
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 2 4}
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg
View file
Expand Up @@ -133,7 +133,7 @@

{GOLD4 200 250 300 350}
{INCOME4 2 6 10 14}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
View file
Expand Up @@ -101,7 +101,7 @@
grouping=defensive
caution=0.9
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
View file
Expand Up @@ -125,7 +125,7 @@

gold=0
income=-10
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 99}

Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg
View file
Expand Up @@ -46,7 +46,7 @@
recruitment_pattern=scout,scout,fighter
village_value=2 # they want to pillage!
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[story]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
View file
Expand Up @@ -57,7 +57,7 @@
aggression=0.0
caution=0.50
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{MEMOIRS_DEATHS}
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
View file
Expand Up @@ -67,7 +67,7 @@
[/ai]
{GOLD 200 200 300}
team_name=baddies
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
4 changes: 2 additions & 2 deletions data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
View file
Expand Up @@ -53,7 +53,7 @@
[ai]
villages_per_scout=15
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 2 4}

Expand All @@ -70,7 +70,7 @@
[ai]
villages_per_scout=10
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
{STARTING_VILLAGES 3 4}

Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
View file
Expand Up @@ -45,7 +45,7 @@
team_name=baddies
user_team_name= _ "Enemies"
{GOLD 150 200 250}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 1 4}
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
View file
Expand Up @@ -124,7 +124,7 @@
{GOLD 250 290 370}
{INCOME 1 2 4}
team_name=orcs
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
6 changes: 3 additions & 3 deletions data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
View file
Expand Up @@ -94,7 +94,7 @@
grouping=no
[/ai]
{INCOME 4 8 12}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down Expand Up @@ -129,7 +129,7 @@
grouping=no
[/ai]
{INCOME 4 8 12}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down Expand Up @@ -164,7 +164,7 @@
grouping=no
[/ai]
{INCOME 4 8 12}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
6 changes: 3 additions & 3 deletions data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
View file
Expand Up @@ -95,7 +95,7 @@
#endif
{GOLD 150 260 330}
team_name=orcs
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
type=Orcish Warrior
Expand All @@ -117,7 +117,7 @@
#endif
{GOLD 150 250 300}
team_name=orcs
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[side]
type=Orcish Warrior
Expand Down Expand Up @@ -165,7 +165,7 @@

{GOLD 150 250 300}
team_name=orcs
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]
[event]
name=prestart
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
View file
Expand Up @@ -88,7 +88,7 @@
caution=0.1
recruitment_pattern=fighter,archer,scout
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
View file
Expand Up @@ -59,7 +59,7 @@
caution=0.5
recruitment_pattern=scout,fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES_ALL 2}
Expand Down
4 changes: 2 additions & 2 deletions data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
View file
Expand Up @@ -63,7 +63,7 @@
grouping=offensive
recruitment_pattern=mixed fighter,fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand All @@ -82,7 +82,7 @@
[ai]
aggression=0.7
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
4 changes: 2 additions & 2 deletions data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
View file
Expand Up @@ -66,7 +66,7 @@
village_value=0.5
recruitment_pattern=scout,archer,archer,fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 2 8}
Expand All @@ -90,7 +90,7 @@
villages_per_scout=6
recruitment_pattern=archer,scout,fighter
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 3 8}
Expand Down
6 changes: 3 additions & 3 deletions data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
View file
Expand Up @@ -85,7 +85,7 @@
value=1
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 2 10}
Expand Down Expand Up @@ -122,7 +122,7 @@
value=1
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 3 7}
Expand Down Expand Up @@ -159,7 +159,7 @@
value=1
[/goal]
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 4 8}
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file
Expand Up @@ -64,7 +64,7 @@
villages_per_scout=8
village_value=0.5
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Eastern_Invasion/scenarios/04a_An_Elven_Alliance.cfg
View file
Expand Up @@ -65,7 +65,7 @@
{GOLD 125 150 175}
team_name=monster
user_team_name=_"Monsters"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[event]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Eastern_Invasion/scenarios/06_Two_Paths.cfg
View file
Expand Up @@ -42,7 +42,7 @@
{INCOME 5 8 10}
team_name=evil
user_team_name=_"Evil"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 2 5}
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
View file
Expand Up @@ -60,7 +60,7 @@
team_name=evil
user_team_name=_"Evil"
{GOLD 150 200 250}
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg
View file
Expand Up @@ -66,7 +66,7 @@
[ai]
grouping=no
[/ai]
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

{STARTING_VILLAGES 3 9}
Expand Down
2 changes: 1 addition & 1 deletion data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
View file
Expand Up @@ -72,7 +72,7 @@
[/ai]
team_name=bad
user_team_name=_"Orcs"
{FLAG_VARIANT ragged}
{FLAG_VARIANT6 ragged}
[/side]

[side]
Expand Down

0 comments on commit 992ebe1

Please sign in to comment.