Author: fendrin
Date: Mon Mar 7 15:00:20 2011
New Revision: 48814
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48814&view=rev
Log:
Applied patch #2585
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
trunk/data/campaigns/Legend_of_Wesmere/utils/characters.cfg
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg?rev=48814&r1=48813&r2=48814&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian_under_Attack.cfg
Mon Mar 7 15:00:20 2011
@@ -889,12 +889,12 @@
[/message]
[message]
id=Galtrid
- message= _ "Then you have not heard the ill tidings. King
Haldric has broken the treaty. The humans will not come to our help!"
+ message= _ "Then you have not heard the ill tidings. King
Haldric has broken the treaty. The humans will not come to our aid!"
[/message]
[message]
id=Landar
#TODO ESR
- message= _ "How can they dare to brake the treaty!"
+ message= _ "How can they dare to break the treaty!"
[/message]
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg?rev=48814&r1=48813&r2=48814&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg Mon
Mar 7 15:00:20 2011
@@ -52,6 +52,11 @@
{NEXT unit}
{FOREACH villages village}
+ #Make the villages on the old map neutral
+ [capture_village]
+ x=$villages[$village].x
+ y=$villages[$village].y
+ [/capture_village]
{VARIABLE_OP villages[$village].x add {OFFSET_X}}
{VARIABLE_OP villages[$village].y add {OFFSET_Y}}
{NEXT village}
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg?rev=48814&r1=48813&r2=48814&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg Mon
Mar 7 15:00:20 2011
@@ -114,6 +114,7 @@
[not]
id=Uradredia
[/not]) side 1}
+ {AI_CONTROLLER (kalenz) () () ()}
[/event]
[event]
@@ -136,8 +137,19 @@
recruit={ELVES}
x=24
y=7
+ {ai/aliases/stable_singleplayer.cfg}
+ [ai]
+ {AI_SIMPLE_ALWAYS_ASPECT passive_leader_shares_keep yes}
+ {AI_SIMPLE_ALWAYS_ASPECT villages_per_scout 0}
+ {AI_SIMPLE_ALWAYS_ASPECT aggression 0.0}
+ {AI_SIMPLE_ALWAYS_ASPECT caution 0.75}
+ {AI_SIMPLE_ALWAYS_ASPECT grouping defensive}
+ [/ai]
[/side]
-
+
+ {AI_CONTROLLER (kalenz) 1 2 ()}
+ {AI_CONTROLLER_ALLOW_LEADER_CONTROL 1 2}
+
[side]
{PLAYABLE}
[unit]
@@ -147,6 +159,10 @@
y=38
[/unit]
side=3
+#ifndef MULTIPLAYER
+ controller=ai
+ allow_player=no
+#endif
no_leader=yes
team_name=landar
persistent=yes
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg?rev=48814&r1=48813&r2=48814&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg Mon Mar
7 15:00:20 2011
@@ -25,12 +25,12 @@
{EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
{EXTRA_SCENARIO_MUSIC casualties_of_war.ogg}
- #TODO music
-
{LOW_PRESTART}
next_scenario=24_Epilogue
[story]
+ #TODO that story needs to be changed for multiplayer
+ #We have not seen how the war went because it is no longer
predictable
[part]
# wmllint: local spelling Gitamoth
story= _ "It is said that the battle with the North Elves was
the beginning of the end for Landarâs revolt. But civil war smoldered on for
many more years, neither side mustering enough strength to achieve a decisive
victory. Until, eventually, Landarâs increasingly harsh and arrogant ways
drove away many of his followers. After assembling all the troops he could,
Kalenz marched against his old friend and now mortal enemy, Landar, in the
forest of Gitamoth..."
@@ -44,12 +44,15 @@
{PLAYABLE}
# wmllint: recognize Kalenz
recruit={ELVES}
- {GOLD 200 160 160}
+ {GOLD 200 160 160} #TODO too similar
+#ifndef MULTIPLAYER
+ #TODO Let's keep cleodil out of multiplayer, shall we?
[unit]
{CLEODIL}
#wmllint: recognize Cleodil
placement=leader
[/unit]
+#endif
[/side]
#wmllint: validate-on
[event]
Modified: trunk/data/campaigns/Legend_of_Wesmere/utils/characters.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/utils/characters.cfg?rev=48814&r1=48813&r2=48814&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/utils/characters.cfg (original)
+++ trunk/data/campaigns/Legend_of_Wesmere/utils/characters.cfg Mon Mar 7
15:00:20 2011
@@ -56,7 +56,9 @@
{ABILITY_ELATES_KALENZ}
{ABILITY_HEALS_KALENZ}
#endif
- {ABILITY_EXTRA_HEAL}
+ #TODO test the whole extra traits things.
+# {ABILITY_EXTRA_HEAL}
+ {ABILITY_CURES}
[/abilities]
[modifications]
{TRAIT_QUICK}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
