Merge branch 'master' of git://github.com/wesnoth/wesnoth

This commit is contained in:
Chris Beck 2014-05-22 23:00:16 -04:00
commit f70cd0d6bc
4 changed files with 10 additions and 10 deletions

View File

@ -55,7 +55,7 @@
side=2
controller=ai
no_leader=yes
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
team_name=forest
@ -69,7 +69,7 @@
side=3
controller=ai
no_leader=yes
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
team_name=ghasts
@ -83,7 +83,7 @@
side=4
controller=ai
no_leader=yes
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
team_name=spiders
@ -97,7 +97,7 @@
side=5
controller=ai
no_leader=yes
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
team_name=yetis
@ -111,7 +111,7 @@
side=6
controller=ai
no_leader=yes
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
team_name=wolves
@ -125,7 +125,7 @@
side=7
controller=ai
no_leader=yes
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
team_name=whelps,forest

View File

@ -16,7 +16,7 @@
controller=ai
id=LuaAI
type=Lieutenant
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
canrecruit=yes

View File

@ -33,7 +33,7 @@
id=Koorzhar
type=Lieutenant
persistent=no
fight_on_without_leader=yes
defeat_condition=no_units_left
team_name=Koorzhar
user_team_name= _ "team_name^Koorzhar"

View File

@ -34,7 +34,7 @@
side=2
controller=ai
no_leader=yes
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
team_name=wolves
@ -48,7 +48,7 @@
side=3
controller=ai
no_leader=yes
fight_on_without_leader=yes
defeat_condition=no_units_left
persistent=no
team_name=wolves3