wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/data scenarios/Heir_To_The_Throne/A_Cho...


From: Susanna Bjrverud
Subject: [Wesnoth-cvs-commits] wesnoth/data scenarios/Heir_To_The_Throne/A_Cho...
Date: Wed, 13 Apr 2005 07:55:33 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Susanna Björverud <address@hidden>      05/04/13 11:55:33

Modified files:
        data/scenarios/Heir_To_The_Throne: A_Choice_Must_Be_Made.cfg 
                                           Elven_Council.cfg intro.cfg 
        data/scenarios/Son_Of_The_Black_Eye: Black_Flag.cfg 
                                             Clash_Of_Armies.cfg 
                                             Desert_Of_Death.cfg 
                                             End_Of_Peace.cfg 
                                             Saving_Inarix.cfg 
                                             Shan_Taum_The_Smug.cfg 
                                             Silent_Forest.cfg 
                                             The_Siege_Of_Barag_Gor.cfg 
                                             To_The_Harbour_Of_Tirigaz.cfg 
                                             Towards_Mountains_of_Haag.cfg 
                                             deaths.cfg story.cfg 
        data/scenarios/The_Rise_of_Wesnoth: Epilogue.cfg 
                                            Return_to_Oldwood.cfg 
        data/scenarios/multiplayer: Clash.cfg Random_Scenario_Marsh.cfg 
                                    Random_Scenario_Winter.cfg 
        data/units     : Ancient_Wose.cfg Bone_Shooter.cfg Draug.cfg 
                         Elvish_Sorceress.cfg Elvish_Sylph.cfg 
                         Grand_Marshal.cfg Javelineer.cfg 
                         Mermaid_Diviner.cfg Mermaid_Initiate.cfg 
                         Mermaid_Priestess.cfg Merman_Hoplite.cfg 
                         Merman_Warrior.cfg Naga-Fighter.cfg 
                         Naga-Myrmidon.cfg Naga-Warrior.cfg 
                         Orcish_Leader.cfg Orcish_Ruler.cfg 
                         Orcish_Sovereign.cfg Soul_Shooter.cfg 

Log message:
        Removed double space from within translatable strings. In the process
        some re-indentation has occurred. Also removed the non-utf8 Gruu death 
event

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Clash.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Ancient_Wose.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Bone_Shooter.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Draug.cfg.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Sorceress.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Elvish_Sylph.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Grand_Marshal.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Javelineer.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Diviner.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Initiate.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Priestess.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Hoplite.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Warrior.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga-Fighter.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga-Myrmidon.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga-Warrior.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Leader.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Ruler.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Sovereign.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Soul_Shooter.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg
diff -u 
wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.22 
wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.23
--- wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg:1.22    
Mon Mar 28 23:06:28 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg Wed Apr 
13 11:55:32 2005
@@ -188,7 +188,7 @@
                                [/message]
                                [message]
                                description=Delfador
-                               message= _ "Friends, peace! Though we are out 
of the tunnels, we are hardly safe. We are somewhere in the arid and wild north 
lands, that is all we know. Behold! To the north,  orcs, to the south, dark 
hordes. We must remain at peace with one another, or else all perish!"
+                               message= _ "Friends, peace! Though we are out 
of the tunnels, we are hardly safe. We are somewhere in the arid and wild north 
lands, that is all we know. Behold! To the north, orcs, to the south, dark 
hordes. We must remain at peace with one another, or else all perish!"
                                [/message]
                                [message]
                                description=Li'sar
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.19 
wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.20
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg:1.19    Mon Mar 
28 23:06:28 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg Wed Apr 13 
11:55:32 2005
@@ -165,7 +165,7 @@
                                [/message]
                                [message]
                                description=Delfador
-                               message= _ "Though you have the Scepter, 
Princess, it is rightfully Konrad's. You  have it now only because we helped 
you get it."
+                               message= _ "Though you have the Scepter, 
Princess, it is rightfully Konrad's. You have it now only because we helped you 
get it."
                                [/message]
                                [message]
                                description=Li'sar
Index: wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg:1.8 
wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg:1.9
--- wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg:1.8     Mon Mar 28 
23:06:28 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg Wed Apr 13 11:55:32 2005
@@ -9,7 +9,7 @@
        background=campaigns/Heir_To_The_Throne/story/story1.png
        [/part]
        [part]
-       story= _ "Eldred was a brave and courageous warrior, able to lead his 
soldiers well. Unfortunately for Garard, his son was also ambitious... and 
treacherous. In the heat of battle,  Eldred's men turned on the king. And so, 
Garard was slain in battle that day, along with his brother and all his sons 
but Eldred."
+       story= _ "Eldred was a brave and courageous warrior, able to lead his 
soldiers well. Unfortunately for Garard, his son was also ambitious... and 
treacherous. In the heat of battle, Eldred's men turned on the king. And so, 
Garard was slain in battle that day, along with his brother and all his sons 
but Eldred."
        background=campaigns/Heir_To_The_Throne/story/story2.png
        [/part]
        [part]
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.21 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.22
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.21     Mon Apr 
11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg  Wed Apr 13 
11:55:32 2005
@@ -149,7 +149,7 @@
                [/message]
                [message]
                description="Pirk"
-               message= _ "Looks like they are to be facing attack from 
pirates of the High Sea.  We should help them."
+               message= _ "Looks like they are to be facing attack from 
pirates of the High Sea. We should help them."
                [/message]
                [message]
                description="Vraurk"
@@ -157,19 +157,19 @@
                [/message]
                [message]
                description="Pirk"
-               message= _ "Call for reinforcements?  Do you mean you don't 
want to fight for our brothers?  Are you a coward, Vraurk?"
+               message= _ "Call for reinforcements? Do you mean you don't want 
to fight for our brothers? Are you a coward, Vraurk?"
                [/message]
                [message]
                description="Vraurk"
-               message= _ "Me?  I'll show you if I'm a coward!"
+               message= _ "Me? I'll show you if I'm a coward!"
                [/message]
                [message]
                description="Kapou'e"
-               message= _ "It is not time for quarreling!  I'm to contain 
them, go find reinforcements."
+               message= _ "It is not time for quarreling! I'm to contain them, 
go find reinforcements."
                [/message]
                [message]
                description="Gork"
-               message= _ "This is a wise choice.  Good luck, son of the Black 
Eye."
+               message= _ "This is a wise choice. Good luck, son of the Black 
Eye."
                [/message]
                [kill]
                description=Gork
@@ -182,140 +182,140 @@
                [/kill]
                [message]
                description="Slowhand"
-               message= _ "Haha!  Our plan is going well, let surround them on 
land while our allies attack them from sea!"
+               message= _ "Haha! Our plan is going well, let surround them on 
land while our allies attack them from sea!"
                [/message]
        [/event]
 
        [event]
-         name=turn 2
-         {MOVE_TRANSPORT_GALEON 2 28 9 30 3,4,5,6,7,8,9 28,28,28,28,29,29,30}
-         [message]
-                 description="Kapou'e"
-                 message= _ "We are attacked from both sides!  Grüü, hold 
them while I run to Tirigaz to find forces to counter attack.  Although we 
can't defeat those pirates without naval forces, we can wipe humans out of this 
region."
-         [/message]
-         [message]
-                 description="Grüü"
-                 message= _ "I love this strategy, chief!"
-         [/message]
+       name=turn 2
+       {MOVE_TRANSPORT_GALEON 2 28 9 30 3,4,5,6,7,8,9 28,28,28,28,29,29,30}
+       [message]
+               description="Kapou'e"
+               message= _ "We are attacked from both sides! Grüü, hold them 
while I run to Tirigaz to find forces to counter attack. Although we can't 
defeat those pirates without naval forces, we can wipe humans out of this 
region."
+       [/message]
+       [message]
+               description="Grüü"
+               message= _ "I love this strategy, chief!"
+       [/message]
        [/event]
        
        [event]
-         name=turn 3
-         {MOVE_TRANSPORT_GALEON 9 30 15 30 10,11,12,13,14,15 30,30,30,30,30,30}
+       name=turn 3
+       {MOVE_TRANSPORT_GALEON 9 30 15 30 10,11,12,13,14,15 30,30,30,30,30,30}
        [/event]
 
        [event]
-         name=turn 4
-         {MOVE_TRANSPORT_GALEON 15 30 20 30 16,17,18,19,20 30,30,30,30,30}
+       name=turn 4
+       {MOVE_TRANSPORT_GALEON 15 30 20 30 16,17,18,19,20 30,30,30,30,30}
        [/event]
 
        [event]
-         name=turn 5
-         {MOVE_TRANSPORT_GALEON 20 30 25 30 20,21,22,23,24,25 
30,30,30,30,30,30}
-       [/event]
-
-       [event]
-         name=turn 6
-         {MOVE_TRANSPORT_GALEON 25 30 27 25 26,27,27,27,27,27 
29,29,28,27,26,25}
-
-         [unit]
-                 description="J'rem"
-                 type=Fencer
-                 x=26
-                 y=24
-                 side=3
-         [/unit]
-         [unit]
-                 type=Fencer
-                 x=27
-                 y=24
-                 side=3
-         [/unit]
-         [unit]
-                 type=Swordsman
-                 x=26
-                 y=25
-                 side=3
-         [/unit]
-         [unit]
-                 type=Mage
-                 x=28
-                 y=24
-                 side=3
-         [/unit]
-         [unit]
-                 type=Cavalryman
-                 x=28
-                 y=25
-                 side=3
-         [/unit]
-         [unit]
-                 type=Cavalryman
-                 x=28
-                 y=25
-                 side=3
-         [/unit]
-         [unit]
-                 type=Cavalryman
-                 x=28
-                 y=25
-                 side=3
-         [/unit]
-         [message]
-                 description="J'rem"
-                 message= _ "Pillage!  Let's plunder these orcs!"
-         [/message]
+       name=turn 5
+       {MOVE_TRANSPORT_GALEON 20 30 25 30 20,21,22,23,24,25 30,30,30,30,30,30}
+       [/event]
+
+       [event]
+       name=turn 6
+       {MOVE_TRANSPORT_GALEON 25 30 27 25 26,27,27,27,27,27 29,29,28,27,26,25}
+
+       [unit]
+               description="J'rem"
+               type=Fencer
+               x=26
+               y=24
+               side=3
+       [/unit]
+       [unit]
+               type=Fencer
+               x=27
+               y=24
+               side=3
+       [/unit]
+       [unit]
+               type=Swordsman
+               x=26
+               y=25
+               side=3
+       [/unit]
+       [unit]
+               type=Mage
+               x=28
+               y=24
+               side=3
+       [/unit]
+       [unit]
+               type=Cavalryman
+               x=28
+               y=25
+               side=3
+       [/unit]
+       [unit]
+               type=Cavalryman
+               x=28
+               y=25
+               side=3
+       [/unit]
+       [unit]
+               type=Cavalryman
+               x=28
+               y=25
+               side=3
+       [/unit]
+       [message]
+               description="J'rem"
+               message= _ "Pillage! Let's plunder these orcs!"
+       [/message]
        [/event]
        
        [event]
-         name=die
-                 [filter]
-                 description=Slowhand
-                 [/filter]
-                 [message]
-                   speaker=unit
-                   message= _ "Aaaargh!  I die!"
-                 [/message]
-                 [message]
-                   description="Kapou'e"
-                   message= _ "Finally you paid for all of what you did to my 
Orc brothers!"
-                 [/message]
-                 {ORCISH_SHAMAN 26 1 Pirk}
-                 {OLD_ORCISH_SHAMAN 27 1 Gork}
-                 {NOVICE_ORCISH_SHAMAN 28 1 Vraurk}
-                 [message]
-                   description=Gork
-                   message= _ "We're back! We have bad news, the humans are 
regrouping on our tails, we must leave."
-                 [/message]
-                 [message]
-                   description=Kapou'e
-                   message= _ "But where is the rest of the council?  We 
haven't made such a long journey to flee!"
-                 [/message]
-                 [message]
-                   description=Pirk
-                   message= _ "We had news from them, all of them fled to the 
East, near the Mourned Hills.  I think we should go for them as soon as 
possible and evacuate this city."
-                 [/message]
-                 [message]
-                   description=Kapou'e
-                   message= _ "But it is beyond the Desert of Death, which is 
full of poisonous giant scorpions and outlaws.  And bypassing it would take 
ages!  Not to mention after this desert, we'll have to cross the Silent Forest!"
-                 [/message]
-                 [message]
-                   description=Grüü
-                   message= _ "So we have no choice ... I've never tasted 
scorpions but sure, this journey promises to be fun."
-                 [/message]
-                 [kill]
-                   description=Eastern_Tower
-                 [/kill]
-                 [kill]
-                   description=Northern_Tower
-                 [/kill]
-                 [kill]
-                   description=Western_Tower
-                 [/kill]
-                 [endlevel]
-                 result=victory
-                 bonus=yes
-                 [/endlevel]
+       name=die
+               [filter]
+               description=Slowhand
+               [/filter]
+               [message]
+               speaker=unit
+               message= _ "Aaaargh! I die!"
+               [/message]
+               [message]
+               description="Kapou'e"
+               message= _ "Finally you paid for all of what you did to my Orc 
brothers!"
+               [/message]
+               {ORCISH_SHAMAN 26 1 Pirk}
+               {OLD_ORCISH_SHAMAN 27 1 Gork}
+               {NOVICE_ORCISH_SHAMAN 28 1 Vraurk}
+               [message]
+               description=Gork
+               message= _ "We're back! We have bad news, the humans are 
regrouping on our tails, we must leave."
+               [/message]
+               [message]
+               description=Kapou'e
+               message= _ "But where is the rest of the council? We haven't 
made such a long journey to flee!"
+               [/message]
+               [message]
+               description=Pirk
+               message= _ "We had news from them, all of them fled to the 
East, near the Mourned Hills. I think we should go for them as soon as possible 
and evacuate this city."
+               [/message]
+               [message]
+               description=Kapou'e
+               message= _ "But it is beyond the Desert of Death, which is full 
of poisonous giant scorpions and outlaws. And bypassing it would take ages! Not 
to mention after this desert, we'll have to cross the Silent Forest!"
+               [/message]
+               [message]
+               description=Grüü
+               message= _ "So we have no choice ... I've never tasted 
scorpions but sure, this journey promises to be fun."
+               [/message]
+               [kill]
+               description=Eastern_Tower
+               [/kill]
+               [kill]
+               description=Northern_Tower
+               [/kill]
+               [kill]
+               description=Western_Tower
+               [/kill]
+               [endlevel]
+               result=victory
+               bonus=yes
+               [/endlevel]
        [/event]
 
        {scenarios/Son_Of_The_Black_Eye/deaths.cfg}
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.25 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.26
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.25        
Mon Apr 11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg     Wed Apr 
13 11:55:32 2005
@@ -2,22 +2,22 @@
 {utils.cfg}
 
 
-  [scenario]
-    id=Clash_of_armies
-    #textdomain wesnoth-sotbe
-    name= _ "Clash of Armies"
-    map_data="{maps/Son_Of_The_Black_Eye/Clash_Of_Armies}"
-    turns=24
-    
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
+[scenario]
+       id=Clash_of_armies
+       #textdomain wesnoth-sotbe
+       name= _ "Clash of Armies"
+       map_data="{maps/Son_Of_The_Black_Eye/Clash_Of_Armies}"
+       turns=24
+       
+       {SECOND_WATCH}
+       {DAWN}
+       {MORNING}
+       {AFTERNOON}
+       {DUSK}
+       {FIRST_WATCH}
 
-    next_scenario="null"
-    music="wesnoth-2.ogg"
+       next_scenario="null"
+       music="wesnoth-2.ogg"
 
        [event]
        name=prestart
@@ -46,411 +46,411 @@
                [/objectives]
        [/event]
 
-    [side]
-      type=Orcish Leader
-      description=Kapou'e
-      user_description= _ "Kapou'e"
-      side=1
-      canrecruit=1
-      controller=human
-      recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Saurian 
Skirmisher
-      team_name=Kapoue
-      gold=100
-      {BLACK_FLAG}
-    [/side]
-
-    [side]
-      race=Elf
-      type=Elvish Champion
-      description=Mkel
-      user_description= _ "Mkel"
-      side=2
-      canrecruit=1
-       [ai]
-         aggression=1.0
-         recruitment_pattern=scout, scout, fighter, fighter, fighter, healer, 
archer
-         grouping=no
-           [target]
-             type="Watch Tower"
-             value=50
-           [/target]
-         recruitment_ignore_bad_combat=yes
-         recruitment_ignore_bad_movement=yes
+       [side]
+               type=Orcish Leader
+               description=Kapou'e
+               user_description= _ "Kapou'e"
+               side=1
+               canrecruit=1
+               controller=human
+               recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, 
Saurian Skirmisher
+               team_name=Kapoue
+               gold=100
+               {BLACK_FLAG}
+       [/side]
+
+       [side]
+               race=Elf
+               type=Elvish Champion
+               description=Mkel
+               user_description= _ "Mkel"
+               side=2
+               canrecruit=1
+                       [ai]
+       aggression=1.0
+       recruitment_pattern=scout, scout, fighter, fighter, fighter, healer, 
archer
+       grouping=no
+       [target]
+       type="Watch Tower"
+       value=50
+       [/target]
+       recruitment_ignore_bad_combat=yes
+       recruitment_ignore_bad_movement=yes
        [/ai]
-      recruit=Elvish Captain, Elvish Fighter, Elvish Archer, Elvish Marksman, 
Elvish Druid, Elvish Scout
-      team_name=vilains
-      village_value=0.0
-      leader_value=50.0
-      {GOLD 200, 200, 250}
-      {INCOME 15, 30, 45}
-    [/side]
-
-    [side]
-      race=Dwarf
-      type=Dwarvish Steelclad
-      description=Oumph
-      user_description= _ "Oumph"
-      side=3
-      canrecruit=1
-       [ai]
-         recruitment_pattern=scout, scout, scout, scout, fighter, archer
-         aggression=1.0
-         villages_per_scout=10
-         grouping=no
-         [target]
-           type="Watch Tower"
-           value=50
-         [/target]
-         recruitment_ignore_bad_combat=yes
-         recruitment_ignore_bad_movement=yes
+               recruit=Elvish Captain, Elvish Fighter, Elvish Archer, Elvish 
Marksman, Elvish Druid, Elvish Scout
+               team_name=vilains
+               village_value=0.0
+               leader_value=50.0
+               {GOLD 200, 200, 250}
+               {INCOME 15, 30, 45}
+       [/side]
+
+       [side]
+               race=Dwarf
+               type=Dwarvish Steelclad
+               description=Oumph
+               user_description= _ "Oumph"
+               side=3
+               canrecruit=1
+                       [ai]
+       recruitment_pattern=scout, scout, scout, scout, fighter, archer
+       aggression=1.0
+       villages_per_scout=10
+       grouping=no
+       [target]
+       type="Watch Tower"
+       value=50
+       [/target]
+       recruitment_ignore_bad_combat=yes
+       recruitment_ignore_bad_movement=yes
        [/ai]
-      village_value=0.0
-      recruit=Dwarvish Fighter, Dwarvish Thunderer, Bandit, Gryphon Rider
-      team_name=vilains
-      {GOLD 200, 250, 300}
-      {INCOME 15, 30, 45}
-    [/side]
-
-    [side]
-      race=Human
-      type=General
-      description=Earl Lanbec'h
-      user_description= _ "Earl Lanbec'h"
-      side=4
-      canrecruit=1
-      grouping=no
-      [ai]
+               village_value=0.0
+               recruit=Dwarvish Fighter, Dwarvish Thunderer, Bandit, Gryphon 
Rider
+               team_name=vilains
+               {GOLD 200, 250, 300}
+               {INCOME 15, 30, 45}
+       [/side]
+
+       [side]
+               race=Human
+               type=General
+               description=Earl Lanbec'h
+               user_description= _ "Earl Lanbec'h"
+               side=4
+               canrecruit=1
+               grouping=no
+               [ai]
        aggression=1.0
        recruitment_pattern=fighter, archer, mixed fighter
        [target]
-         type="Watch Tower"
-         value=50
+       type="Watch Tower"
+       value=50
        [/target]
        recruitment_ignore_bad_combat=yes
        recruitment_ignore_bad_movement=yes
-      [/ai]
-      leader_value=50.0
-      village_value=0.0
-      recruit=Swordsman, Red Mage, Pikeman, Heavy Infantryman, Fencer, Bowman
-      team_name=vilains
-      {GOLD 150, 200, 250}
-      {INCOME 15, 30, 45}
-    [/side]
-
-    [side]
-      race=Merman
-      type=Merman Warrior
-      description=Plouf
-      user_description= _ "Plouf"
-      side=5
-      canrecruit=0
-      [ai]
+               [/ai]
+               leader_value=50.0
+               village_value=0.0
+               recruit=Swordsman, Red Mage, Pikeman, Heavy Infantryman, 
Fencer, Bowman
+               team_name=vilains
+               {GOLD 150, 200, 250}
+               {INCOME 15, 30, 45}
+       [/side]
+
+       [side]
+               race=Merman
+               type=Merman Warrior
+               description=Plouf
+               user_description= _ "Plouf"
+               side=5
+               canrecruit=0
+               [ai]
        aggression=1.0
        [target]
-         value=50
-         x=23-26
-         y=9-12
+       value=50
+       x=23-26
+       y=9-12
        [/target]
        [target]
-         side=1
-         value=20
+       side=1
+       value=20
        [/target]
-      [/ai]
-      team_name=vilains
-    [/side]
-
-    [story]
-        [part]
-          background=campaigns/Son_Of_The_Black_Eye/maps/sotbe3.png
-            show_title=yes
-            {CROSS 318 378}
-        [/part]
-    [/story]
-
-    [event]
-      name=prestart
-      {RECALL Grüü}
-      {RECALL Inarix}
-      {RECALL Plonk}
-      {WATCH_TOWER 31 2 (Eastern Tower)}
-      {WATCH_TOWER 20 1 (Western Tower)}
-      {WATCH_TOWER 25 4 (Southern Tower)}
-      [role]
-        type=Orcish Warlord,Troll Warrior,Orcish Warrior,Saurian 
Ambusher,Troll,Orcish Grunt,Saurian Skirmisher,Troll Whelp
-        role=cannonfodder
-      [/role]
-      [recall]
-        role=cannonfodder
-       x=24
-       y=11
-      [/recall]
-      [teleport]
-        [filter]
-          role=cannonfodder
-       [/filter]        
-       x=24
-       y=11
-      [/teleport]
-      [role]
-       role=cannonfodder2
-       type=Orcish Crossbowman,Orcish Slayer,Orcish Archer,Orcish Assassin
-      [/role]
-      [recall]
-        role=cannonfodder2
-       x=25
-       y=11
-      [/recall]
-      [teleport]
-        [filter]
-          role=cannonfodder2
-       [/filter]
-       x=25
-       y=11
-      [/teleport]
-    [/event]
-
-    [event]
-      name=start
-
-      [message]
-       speaker="Kapou'e"
-       message= _ "So here we are, they are preparing to assault."
-      [/message]
-
-      [message]
-       speaker="Grüü"
-       message= _ "Prestim's walls are rock hard, they' ll break clean off on 
them."
-      [/message]
-
-      [message]
-       speaker="Inarix"
-       message= _ "I'm not that sure.  Every fortress has its own weakness.  
Prestim's wall are built on three towers.  If one of them is destroyed, a 
breach will allow humans to enter Prestim ... needless to say, this would be 
the end for us."
-      [/message]
-
-      [message]
-       speaker="Kapou'e"
-       message= _ "I've received messengers from the Council, saying that they 
are regrouping tribes into the Great Horde."
-      [/message]
-
-      [message]
-       speaker="Grüü"
-       message= _ "Great!  When do they arrive?"
-      [/message]
-
-      [message]
-       speaker="Kapou'e"
-       message= _ "In four days minimum.  I fear it will be too late."
-      [/message]
-
-      [message]
-       speaker="Inarix"
-       message= _ "I don't think so, there is still a way..."
-      [/message]
-
-      [message]
-       speaker="Kapou'e"
-       message= _ "Which one?"
-      [/message]
-
-      [message]
-       speaker="Inarix"
-       message= _ "Most of forces will cross the river by the ford where the 
bridge where previously.  If we manage to defend it, we might still have a 
chance."
-      [/message]
-
-      [message]
-       speaker="Kapou'e"
-       message= _ "And if we fail?"
-      [/message]
-
-      [message]
-       speaker="Inarix"
-       message= _ "Then they will assault Prestim at five versus one.  We'll 
just have to pray to Mother earth."
-      [/message]
-
-      [message]
-       speaker="Kapou'e"
-       message= _ "Great."
-      [/message]
-
-      [message]
-       speaker="narrator"
-       message= _ "Then, the battle for Prestim began."
-      [/message]
-
-    [/event]
-
-    [event]
-      name=turn 2
-      [unit]
-        side=5
-       type=Triton
-       description=Plouf
-       x=16
-       y=12
-      [/unit]
-      {MERMAN 16 12 Soaf}
-      {MERMAN 16 12 Glou}
-      {MERMAN 16 12 Glorg}
-      [message]
-       speaker="Plouf"
-       message= _ "We arrive to honor our alliance, Earl Lanbec'h."
-      [/message]
-    [/event]
-
-    [event]
-      name=turn 3
-      {MERMAN 16 12 Leffe}
-      {MERMAN 16 12 Kro}
-      {MERMAN 16 12 Sezkat}
-    [/event]
-
-    [event]
-      name=turn 4
-      {MERMAN 16 12 Kir}
-      {MERMAN 16 12 Pastis}
+               [/ai]
+               team_name=vilains
+       [/side]
+
+       [story]
+               [part]
+       background=campaigns/Son_Of_The_Black_Eye/maps/sotbe3.png
+                       show_title=yes
+                       {CROSS 318 378}
+               [/part]
+       [/story]
+
+       [event]
+               name=prestart
+               {RECALL Grüü}
+               {RECALL Inarix}
+               {RECALL Plonk}
+               {WATCH_TOWER 31 2 (Eastern Tower)}
+               {WATCH_TOWER 20 1 (Western Tower)}
+               {WATCH_TOWER 25 4 (Southern Tower)}
+               [role]
+               type=Orcish Warlord,Troll Warrior,Orcish Warrior,Saurian 
Ambusher,Troll,Orcish Grunt,Saurian Skirmisher,Troll Whelp
+               role=cannonfodder
+               [/role]
+               [recall]
+               role=cannonfodder
+               x=24
+               y=11
+               [/recall]
+               [teleport]
+               [filter]
+               role=cannonfodder
+               [/filter]               
+               x=24
+               y=11
+               [/teleport]
+               [role]
+               role=cannonfodder2
+               type=Orcish Crossbowman,Orcish Slayer,Orcish Archer,Orcish 
Assassin
+               [/role]
+               [recall]
+               role=cannonfodder2
+               x=25
+               y=11
+               [/recall]
+               [teleport]
+               [filter]
+               role=cannonfodder2
+               [/filter]
+               x=25
+               y=11
+               [/teleport]
+       [/event]
+
+       [event]
+               name=start
+
+               [message]
+               speaker="Kapou'e"
+               message= _ "So here we are, they are preparing to assault."
+               [/message]
+
+               [message]
+               speaker="Grüü"
+               message= _ "Prestim's walls are rock hard, they' ll break clean 
off on them."
+               [/message]
+
+               [message]
+               speaker="Inarix"
+               message= _ "I'm not that sure. Every fortress has its own 
weakness. Prestim's wall are built on three towers. If one of them is 
destroyed, a breach will allow humans to enter Prestim ... needless to say, 
this would be the end for us."
+               [/message]
+
+               [message]
+                       speaker="Kapou'e"
+                       message= _ "I've received messengers from the Council, 
saying that they are regrouping tribes into the Great Horde."
+               [/message]
+
+               [message]
+                       speaker="Grüü"
+                       message= _ "Great! When do they arrive?"
+               [/message]
+
+               [message]
+                       speaker="Kapou'e"
+                       message= _ "In four days minimum. I fear it will be too 
late."
+               [/message]
+
+               [message]
+                       speaker="Inarix"
+                       message= _ "I don't think so, there is still a way..."
+               [/message]
+
+               [message]
+                       speaker="Kapou'e"
+                       message= _ "Which one?"
+               [/message]
+
+               [message]
+                       speaker="Inarix"
+                       message= _ "Most of forces will cross the river by the 
ford where the bridge where previously. If we manage to defend it, we might 
still have a chance."
+               [/message]
+
+               [message]
+                       speaker="Kapou'e"
+                       message= _ "And if we fail?"
+               [/message]
+
+               [message]
+                       speaker="Inarix"
+                       message= _ "Then they will assault Prestim at five 
versus one. We'll just have to pray to Mother earth."
+               [/message]
+
+               [message]
+                       speaker="Kapou'e"
+                       message= _ "Great."
+               [/message]
+
+               [message]
+                       speaker="narrator"
+                       message= _ "Then, the battle for Prestim began."
+               [/message]
+
+       [/event]
+
+       [event]
+               name=turn 2
+               [unit]
+               side=5
+               type=Triton
+               description=Plouf
+               x=16
+               y=12
+               [/unit]
+               {MERMAN 16 12 Soaf}
+               {MERMAN 16 12 Glou}
+               {MERMAN 16 12 Glorg}
+               [message]
+               speaker="Plouf"
+               message= _ "We arrive to honor our alliance, Earl Lanbec'h."
+               [/message]
+       [/event]
+
+       [event]
+               name=turn 3
+               {MERMAN 16 12 Leffe}
+               {MERMAN 16 12 Kro}
+               {MERMAN 16 12 Sezkat}
+       [/event]
+
+       [event]
+               name=turn 4
+               {MERMAN 16 12 Kir}
+               {MERMAN 16 12 Pastis}
 #ifdef NORMAL
-      {MERMAN 16 12 Jidé}
+               {MERMAN 16 12 Jidé}
 #endif
 #ifdef HARD
-      {MERMAN 16 12 Jidé}
+               {MERMAN 16 12 Jidé}
 #endif
-    [/event]
+       [/event]
 
-    [event]
-      name=turn 5
-      {MERMAN 16 12 Fisher}
-      {MERMAN 16 12 Bunshmills}
+       [event]
+               name=turn 5
+               {MERMAN 16 12 Fisher}
+               {MERMAN 16 12 Bunshmills}
 #ifdef NORMAL
-      {MERMAN 16 12 Despé}
+               {MERMAN 16 12 Despé}
 #endif
 #ifdef HARD
-      {MERMAN 16 12 Despé}
+               {MERMAN 16 12 Despé}
 #endif
-    [/event]
+       [/event]
 
-    [event]
-      name=turn 6
-      {MERMAN 16 12 Fisher}
+       [event]
+               name=turn 6
+               {MERMAN 16 12 Fisher}
 #ifdef NORMAL
-      {MERMAN 16 12 Bunshmills}
-      {MERMAN 16 12 Despé}
+               {MERMAN 16 12 Bunshmills}
+               {MERMAN 16 12 Despé}
 #endif
 #ifdef HARD
-      {MERMAN 16 12 Bunshmills}
-      {MERMAN 16 12 Despé}
+               {MERMAN 16 12 Bunshmills}
+               {MERMAN 16 12 Despé}
 #endif
-    [/event]
+       [/event]
 
-    [event]
-      name=turn 9
-      {MERMAN 16 12 Fisher}
+       [event]
+               name=turn 9
+               {MERMAN 16 12 Fisher}
 #ifdef NORMAL
-      {MERMAN 16 12 Bunshmills}
-      {MERMAN 16 12 Despé}
+               {MERMAN 16 12 Bunshmills}
+               {MERMAN 16 12 Despé}
 #endif
 #ifdef HARD
-      {MERMAN 16 12 Bunshmills}
-      {MERMAN 16 12 Despé}
+               {MERMAN 16 12 Bunshmills}
+               {MERMAN 16 12 Despé}
 #endif
-    [/event]
+       [/event]
 
-    [event]
-      name=turn 11
-      {MERMAN 16 12 Fisher}
+       [event]
+               name=turn 11
+               {MERMAN 16 12 Fisher}
 #ifdef NORMAL
-      {MERMAN 16 12 Bunshmills}
-      {MERMAN 16 12 Despé}
+               {MERMAN 16 12 Bunshmills}
+               {MERMAN 16 12 Despé}
 #endif
 #ifdef HARD
-      {MERMAN 16 12 Bunshmills}
-      {MERMAN 16 12 Despé}
+               {MERMAN 16 12 Bunshmills}
+               {MERMAN 16 12 Despé}
 #endif
-    [/event]
+       [/event]
 
-    [event]
-      name=time over
+       [event]
+               name=time over
+
+               {ORCISH_GRUNT 38 1}
+               {ORCISH_GRUNT 38 1}
+               {ORCISH_GRUNT 38 1}
+               {ORCISH_ARCHER 38 1}
+               {ORCISH_ARCHER 38 1}
+               {ORCISH_ARCHER 38 1}
+               {WOLF_RIDER 38 1}
+               {WOLF_RIDER 38 1}
+               {WOLF_RIDER 38 1}
+               {WOLF_RIDER 38 1}
+               {WOLF_RIDER 38 1}
+               {ORCISH_SHAMAN 38 1 Pirk}
+               {OLD_ORCISH_SHAMAN 38 1 Gork}
+               {NOVICE_ORCISH_SHAMAN 38 1 Vraurk}
+
+               [message]
+                       speaker="Gork"
+                       message= _ "Here we are! Hold on Prestim, we arrive to 
push them to the river!"
+               [/message]
+
+               [message]
+                       speaker="Earl Lanbec'h"
+                       message= _ "They are too numerous now, RETREAT !"
+               [/message]
+
+               [kill]
+               side=5
+               animate=yes
+               [/kill]
+               [kill]
+               side=2
+               animate=yes
+               [/kill]
+               [kill]
+               side=3
+               animate=yes
+               [/kill]
+               [kill]
+               side=4
+               animate=yes
+               [/kill]
+
+               [message]
+                       speaker="Kapou'e"
+                       message= _ "The Great Horde at last! I was beginning to 
think they would never come."
+               [/message]
+
+               [message]
+                       speaker="Gork"
+                       message= _ "The defense of Prestim you've done is 
heroic, facing such opposition surely undermined morale of humans. Now they are 
retreating to their fortresses and won't get out of them."
+               [/message]
+
+               [message]
+                       speaker="Pirk"
+                       message= _ "It is now time to show them who we are and 
to lead the Great Horde to their tails! They won't have a rest until we'll 
destitute Earl Lanbec'h!"
+               [/message]
+
+               [message]
+                       speaker="Kapou'e"
+                       caption="End of chapter I"
+                       message= _ "Kapou'e will come back in Son of the Black 
Eye, chapter II: 'The Great Horde'."
+               [/message]
+
+               [endlevel]
+                       result=victory
+                       bonus=no
+               [/endlevel]
+       [/event]
 
-      {ORCISH_GRUNT 38 1}
-      {ORCISH_GRUNT 38 1}
-      {ORCISH_GRUNT 38 1}
-      {ORCISH_ARCHER 38 1}
-      {ORCISH_ARCHER 38 1}
-      {ORCISH_ARCHER 38 1}
-      {WOLF_RIDER 38 1}
-      {WOLF_RIDER 38 1}
-      {WOLF_RIDER 38 1}
-      {WOLF_RIDER 38 1}
-      {WOLF_RIDER 38 1}
-      {ORCISH_SHAMAN 38 1 Pirk}
-      {OLD_ORCISH_SHAMAN 38 1 Gork}
-      {NOVICE_ORCISH_SHAMAN 38 1 Vraurk}
-
-      [message]
-       speaker="Gork"
-       message= _ "Here we are!  Hold on Prestim, we arrive to push them to 
the river!"
-      [/message]
-
-      [message]
-       speaker="Earl Lanbec'h"
-       message= _ "They are too numerous now, RETREAT !"
-      [/message]
-
-      [kill]
-        side=5
-        animate=yes
-      [/kill]
-      [kill]
-        side=2
-        animate=yes
-      [/kill]
-      [kill]
-        side=3
-        animate=yes
-      [/kill]
-      [kill]
-        side=4
-        animate=yes
-      [/kill]
-
-      [message]
-       speaker="Kapou'e"
-       message= _ "The Great Horde at last!  I was beginning to think they 
would never come."
-      [/message]
-
-      [message]
-       speaker="Gork"
-       message= _ "The defense of Prestim you've done is heroic, facing such 
opposition surely undermined morale of humans.  Now they are retreating to 
their fortresses and won't get out of them."
-      [/message]
-
-      [message]
-       speaker="Pirk"
-       message= _ "It is now time to show them who we are and to lead the 
Great Horde to their tails!  They won't have a rest until we'll destitute Earl 
Lanbec'h!"
-      [/message]
-
-      [message]
-       speaker="Kapou'e"
-       caption="End of chapter I"
-       message= _ "Kapou'e will come back in Son of the Black Eye, chapter II: 
'The Great Horde'."
-      [/message]
-
-      [endlevel]
-       result=victory
-       bonus=no
-      [/endlevel]
-    [/event]
-
-    [event]
-      name=die
-      [filter]
-        type=Watch_Tower
-      [/filter]
-      [message]
-       speaker=Kapou'e
-       message= _ "No!  The walls of Prestim are destroyed, we are done!"
-      [/message]
-      {DEFEAT}
-    [/event]
+       [event]
+               name=die
+               [filter]
+               type=Watch_Tower
+               [/filter]
+               [message]
+                       speaker=Kapou'e
+                       message= _ "No! The walls of Prestim are destroyed, we 
are done!"
+               [/message]
+               {DEFEAT}
+       [/event]
 
-    {scenarios/Son_Of_The_Black_Eye/deaths.cfg}
+       {scenarios/Son_Of_The_Black_Eye/deaths.cfg}
 
-  [/scenario]
+[/scenario]
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:1.21 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:1.22
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:1.21        
Mon Apr 11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg     Wed Apr 
13 11:55:32 2005
@@ -128,28 +128,28 @@
                [/recall]
 
                [message]
-                 description="Kapou'e"
-                 message= _ "It's been two days since we entered this desert.  
I have never been so hot and we have nearly finished our food."
+               description="Kapou'e"
+               message= _ "It's been two days since we entered this desert. I 
have never been so hot and we have nearly finished our food."
                [/message]
                [message]
-                 description="Grüü"
-                 message= _ "I'm hungry and we found no giant scorpion yet.  
I'm sure it would be delicious."
+               description="Grüü"
+               message= _ "I'm hungry and we found no giant scorpion yet. I'm 
sure it would be delicious."
                [/message]
                [message]
-                 description="Kapou'e"
-                 message= _ "I hope we won't find one!  They are terrible 
armored beasts and your troll clubs are useless against their heavy shells."
+               description="Kapou'e"
+               message= _ "I hope we won't find one! They are terrible armored 
beasts and your troll clubs are useless against their heavy shells."
                [/message]
                [message]
-                 description="Vraurk"
-                 message= _ "I've been told the best way to defeat them is to 
attack their eyes with sharp blades.  But I hope too we won't meet them."
+               description="Vraurk"
+               message= _ "I've been told the best way to defeat them is to 
attack their eyes with sharp blades. But I hope too we won't meet them."
                [/message]
                [message]
-                 description="Pirk"
-                 message= _ "The sun is rising, we should resume our journey 
and find this oasis mentioned on the map before the sun gets high."
+               description="Pirk"
+               message= _ "The sun is rising, we should resume our journey and 
find this oasis mentioned on the map before the sun gets high."
                [/message]
                [message]
-                 description="Kapou'e"
-                 message= _ "Stay alert!  This oasis is known to be a den of 
outlaws and desert pillagers."
+               description="Kapou'e"
+               message= _ "Stay alert! This oasis is known to be a den of 
outlaws and desert pillagers."
                [/message]
 
                
@@ -173,8 +173,8 @@
        [event]
        name=victory
                [message]
-                 description="Kapou'e"
-                 message= _ "We've done it!  Now we need some rest, before we 
continue our journey."
+               description="Kapou'e"
+               message= _ "We've done it! Now we need some rest, before we 
continue our journey."
                [/message]
        [/event]
 
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg:1.23 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg:1.24
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg:1.23   Mon Apr 
11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg        Wed Apr 
13 11:55:32 2005
@@ -108,11 +108,11 @@
        name=start
                [message]
                description=Albert
-               message= _ "Look, companions!  Those orcs don't imagine they 
are living their last day.  Let's slay all of them and give this land back to 
our people!"
+               message= _ "Look, companions! Those orcs don't imagine they are 
living their last day. Let's slay all of them and give this land back to our 
people!"
                [/message]
                [message]
                description=Kapou'e
-               message= _ "We are attacked by these humans!  Hurry up, we must 
defend our fathers' land!"
+               message= _ "We are attacked by these humans! Hurry up, we must 
defend our fathers' land!"
                [/message]
                [message]
                speaker=narrator
@@ -127,7 +127,7 @@
                [/filter]
                [message]
                speaker=unit
-               message= _ "Argh!  I die!  But other humans will go and slay 
you, filthy orcs!"
+               message= _ "Argh! I die! But other humans will go and slay you, 
filthy orcs!"
                [/message]
                [role]
                role=second
@@ -135,11 +135,11 @@
                [/role]
                [message]
                role=second
-               message= _ "Hurrah!  Victory!"
+               message= _ "Hurrah! Victory!"
                [/message]
                [message]
                description=Kapou'e
-               message= _ "We are victorious this time, but humans are 
organizing themselves in a huge army.  We have just defeated a vanguard, they 
are coming massively."
+               message= _ "We are victorious this time, but humans are 
organizing themselves in a huge army. We have just defeated a vanguard, they 
are coming massively."
                [/message]
                [message]
                role=second
@@ -147,15 +147,15 @@
                [/message]
                [message]
                description=Kapou'e
-               message= _ "We must lead my people to a safe place and pledge 
the Great Council for assistance.  Some of them live in Barag Gor in the lands 
of the free tribes.  We must leave, now!"
+               message= _ "We must lead my people to a safe place and pledge 
the Great Council for assistance. Some of them live in Barag Gor in the lands 
of the free tribes. We must leave, now!"
                [/message]
                [message]
                role=second
-               message= _ "But the free tribes are beyond the Mountains of 
Haag.  These moutains are infested of dwarves and wild trolls."
+               message= _ "But the free tribes are beyond the Mountains of 
Haag. These moutains are infested of dwarves and wild trolls."
                [/message]
                [message]
                description=Kapou'e
-               message= _ "We have no choice, we shall pass.  The trolls have 
been our allies in the past--maybe they can help us.  Hurry up, we must leave 
now."
+               message= _ "We have no choice, we shall pass. The trolls have 
been our allies in the past--maybe they can help us. Hurry up, we must leave 
now."
                [/message]
                [endlevel]
                result=victory
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg:1.25 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg:1.26
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg:1.25  Mon Apr 
11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg       Wed Apr 
13 11:55:32 2005
@@ -2,90 +2,90 @@
 {utils.cfg}
 
 #define BRIDGE_EXPLODE
-  [sound]
-    name=gunshot.wav
-  [/sound]
-  [delay]
-    time=200
-  [/delay]
-  [sound]
-    name=gunshot.wav
-  [/sound]
-  [delay]
-    time=200
-  [/delay]
-  [sound]
-    name=gunshot.wav
-  [/sound]
-  [delay]
-    time=500
-  [/delay]
-  [sound]
-    name=fire.wav
-  [/sound]
-  [terrain]
-    x=21,22,23
-    y=13,12,12
-    letter=c
-  [/terrain]
-  [kill]
-    x=21,22,23
-    y=13,12,12
-    animate=yes
-    fire_event=yes
-  [/kill]
-  [kill]
-    side=1
-    x=1-24,24-40
-    y=12-40,13-40
-    animate=yes
-    fire_event=yes
-  [/kill]
+       [sound]
+       name=gunshot.wav
+       [/sound]
+       [delay]
+       time=200
+       [/delay]
+       [sound]
+       name=gunshot.wav
+       [/sound]
+       [delay]
+       time=200
+       [/delay]
+       [sound]
+       name=gunshot.wav
+       [/sound]
+       [delay]
+       time=500
+       [/delay]
+       [sound]
+       name=fire.wav
+       [/sound]
+       [terrain]
+       x=21,22,23
+       y=13,12,12
+       letter=c
+       [/terrain]
+       [kill]
+       x=21,22,23
+       y=13,12,12
+       animate=yes
+       fire_event=yes
+       [/kill]
+       [kill]
+       side=1
+       x=1-24,24-40
+       y=12-40,13-40
+       animate=yes
+       fire_event=yes
+       [/kill]
 #enddef
 
 #define CHECK_LIZARD_SAFE
-     [store_unit]
+       [store_unit]
        variable="saurians"
        [filter]
-         race="lizard"
-         x="1-39"
-         y="1-11"
+       race="lizard"
+       x="1-39"
+       y="1-11"
        [/filter]
-      [/store_unit]
-      [set_variable]
+       [/store_unit]
+       [set_variable]
        name="i"
        value="0"
-      [/set_variable]
-      [while]
+       [/set_variable]
+       [while]
        [variable]
-         less_than="$saurians.length"
-         name="i"
+       less_than="$saurians.length"
+       name="i"
        [/variable]
        [do]
-         [set_variable]
-           add="1"
-           name="i"
-         [/set_variable]
+               [set_variable]
+               add="1"
+               name="i"
+               [/set_variable]
        [/do]
-      [/while]
+       [/while]
 #enddef
 
-  [scenario]
-    id="Saving_Inarix"
-    #textdomain wesnoth-sotbe
-    name="Saving Inarix"
-    map_data="{maps/Son_Of_The_Black_Eye/Saving_Inarix}"
-    turns=16
-    
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
+[scenario]
+       id="Saving_Inarix"
+       #textdomain wesnoth-sotbe
+       name="Saving Inarix"
+       map_data="{maps/Son_Of_The_Black_Eye/Saving_Inarix}"
+       turns=16
+
+       {AFTERNOON}
+       {DUSK}
+       {FIRST_WATCH}
+       {SECOND_WATCH}
+       {DAWN}
+       {MORNING}
 
-    next_scenario="Clash_of_armies"
-    music="wesnoth-2.ogg"
+       next_scenario="Clash_of_armies"
+       music="wesnoth-2.ogg"
 
        [event]
        name=prestart
@@ -114,49 +114,49 @@
                [/objectives]
        [/event]
 
-    [side]
-      type=Orcish Leader
-      description=Kapou'e
-      user_description= _ "Kapou'e"
-      side=1
-      canrecruit=1
-      controller=human
-      recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer
-      team_name=Kapoue
-      gold=100
-      {BLACK_FLAG}
-    [/side]
-
-    [side]
-      race=Elf
-      type=Elvish Champion
-      description=Mkel
-      user_description= _ "Mkel"
-      side=2
-      canrecruit=1
-       [ai]
-       aggression=1.0
-       recruitment_pattern=scout, scout, fighter, fighter, fighter, healer, 
archer
-               [target]
+       [side]
+       type=Orcish Leader
+       description=Kapou'e
+       user_description= _ "Kapou'e"
+       side=1
+       canrecruit=1
+       controller=human
+       recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer
+       team_name=Kapoue
+       gold=100
+       {BLACK_FLAG}
+       [/side]
+
+       [side]
+       race=Elf
+       type=Elvish Champion
+       description=Mkel
+       user_description= _ "Mkel"
+       side=2
+       canrecruit=1
+       [ai]
+               aggression=1.0
+               recruitment_pattern=scout, scout, fighter, fighter, fighter, 
healer, archer
+               [target]
                type=Saurian
                value=50
-               [/target]
+               [/target]
        [/ai]
-      recruit=Elvish Fighter, Elvish Archer, Elvish Shaman, Elvish Scout
-      team_name=vilains
-      {GOLD 100, 150, 250}
-      {INCOME 15, 30, 45}
-    [/side]
-
-    [side]
-      race=Dwarf
-      type=Dwarvish Steelclad
-      description=Oumph
-      user_description= _ "Oumph"
-      side=3
-      canrecruit=1
-       [ai]
-       recruitment_pattern=scout, fighter, fighter, fighter, archer
+       recruit=Elvish Fighter, Elvish Archer, Elvish Shaman, Elvish Scout
+       team_name=vilains
+       {GOLD 100, 150, 250}
+       {INCOME 15, 30, 45}
+       [/side]
+
+       [side]
+       race=Dwarf
+       type=Dwarvish Steelclad
+       description=Oumph
+       user_description= _ "Oumph"
+       side=3
+       canrecruit=1
+       [ai]
+               recruitment_pattern=scout, fighter, fighter, fighter, archer
        aggression=1.0
        villages_per_scout=10
                [target]
@@ -164,245 +164,245 @@
                value=50
                [/target]
        [/ai]
-      recruit=Dwarvish Fighter, Dwarvish Thunderer, Footpad, Bandit
-      team_name=vilains
-      {GOLD 100, 150, 200}
-      {INCOME 15, 30, 45}
-    [/side]
-
-    [story]
-       [part]
-                       
background=campaigns/Son_Of_The_Black_Eye/maps/sotbe3.png
-          show_title=yes
-          {DOT 463 171}
-          {DOT 469 193}
-          {DOT 467 217}
-          {DOT 458 241}
-          {DOT 438 270}
-          {DOT 407 297}
-          {DOT 372 309}
-          {DOT 344 314}
-          {DOT 319 324}
-          {DOT 318 350}
-          {CROSS 318 378}
-       [/part]
-    [/story]
-
-    [event]
-      name=prestart
-      [unit]
+       recruit=Dwarvish Fighter, Dwarvish Thunderer, Footpad, Bandit
+       team_name=vilains
+       {GOLD 100, 150, 200}
+       {INCOME 15, 30, 45}
+       [/side]
+
+       [story]
+       [part]
+       background=campaigns/Son_Of_The_Black_Eye/maps/sotbe3.png
+       show_title=yes
+       {DOT 463 171}
+       {DOT 469 193}
+       {DOT 467 217}
+       {DOT 458 241}
+       {DOT 438 270}
+       {DOT 407 297}
+       {DOT 372 309}
+       {DOT 344 314}
+       {DOT 319 324}
+       {DOT 318 350}
+       {CROSS 318 378}
+       [/part]
+       [/story]
+
+       [event]
+       name=prestart
+       [unit]
        type="Orcish Slayer"
        description="Plonk"
        user_description= _ "Plonk"
        x=27
        y=3
-      [/unit]
-      {RECALL Grüü}
-      {WATCH_TOWER 31 2 (Eastern Tower)}
-      {WATCH_TOWER 20 1 (Western Tower)}
-      {WATCH_TOWER 25 4 (Southern Tower)}
-      {ELVISH_FIGHTER_G 24 11}
-      {ELVISH_ARCHER_G 25 11}
-      [unit]
+       [/unit]
+       {RECALL Grüü}
+       {WATCH_TOWER 31 2 (Eastern Tower)}
+       {WATCH_TOWER 20 1 (Western Tower)}
+       {WATCH_TOWER 25 4 (Southern Tower)}
+       {ELVISH_FIGHTER_G 24 11}
+       {ELVISH_ARCHER_G 25 11}
+       [unit]
        type=Orcish Archer
        side=1
        x=25
        y=7
-      [/unit]
-      [set_variable]
+       [/unit]
+       [set_variable]
        name=elvish_casualties
        value=0
-      [/set_variable]
-    [/event]
+       [/set_variable]
+       [/event]
 
-    [event]
-      name=start
-      [message]
+       [event]
+       name=start
+       [message]
        description="Plonk"
-       message= _ "Reinforcements, at least!  Whoever you are, you are welcome 
in Prestim!  The fortified bridge over the Gork river has been taken this 
morning by a small commando of elves, we already tried to assault it twice 
without success."
-      [/message]
-      [message]
+       message= _ "Reinforcements, at least! Whoever you are, you are welcome 
in Prestim! The fortified bridge over the Gork river has been taken this 
morning by a small commando of elves, we already tried to assault it twice 
without success."
+       [/message]
+       [message]
        description="Grüü"
-       message= _ "Ah!  They are no match against my mace."
-      [/message]
-      [message]
+       message= _ "Ah! They are no match against my mace."
+       [/message]
+       [message]
        description="Plonk"
        message= _ "There is worse, our scouts reported that our saurians 
allies led by Inarix are still blocked on the other side of the river some 
miles away. They won't be able to cross the river."
-      [/message]
-      [message]
+       [/message]
+       [message]
        description="Plonk"
-       message= _ "Elves and dwarves have joined humans against us and are 
camping near.  Humans will arrive soon.  We must destroy the southern bridge on 
the river."
-      [/message]
-      [message]
+       message= _ "Elves and dwarves have joined humans against us and are 
camping near. Humans will arrive soon. We must destroy the southern bridge on 
the river."
+       [/message]
+       [message]
        description="Kapou'e"
        message= _ "We must do something!"
-      [/message]
-      [message]
+       [/message]
+       [message]
        description="Grüü"
-       message= _ "I know what we must do.  Kill elves and help Inarix cross."
-      [/message]
-      [message]
+       message= _ "I know what we must do. Kill elves and help Inarix cross."
+       [/message]
+       [message]
        description="Plonk"
-       message= _ "It won't be that easy!  Our enemies are well entrenchered.  
And don't forget, we will sabotage the southern bridge as soon as the bulk of 
Saurians army will have crossed!"
-      [/message]
-      [message]
+       message= _ "It won't be that easy! Our enemies are well entrenchered. 
And don't forget, we will sabotage the southern bridge as soon as the bulk of 
Saurians army will have crossed!"
+       [/message]
+       [message]
        description="Plonk"
        message= _ "Each warrior trapped on the bridge or on the other side of 
the river will perish!"
-      [/message]
-      [set_variable]
+       [/message]
+       [set_variable]
        name=saurians_safe
        value=0
-      [/set_variable]
-    [/event]
+       [/set_variable]
+       [/event]
 
-    [event]
-      name=turn 4
-      {SAURIAN_WARRIOR 8 42 Inarix}
-      {SAURIAN 8 42 Xortex}
-      {SAURIAN 8 42 Merlex}
-      {SAURIAN 8 42 Lagunax}
-      {SAURIAN 8 42 Lux}
-      {SAURIAN 8 42 Otomox}
-      {SAURIAN 8 42 Emax}
-      {SAURIAN 8 42 Fabix}
-      {SAURIAN 8 42 Morganx}
-      {SAURIAN 8 42 Stelianx}
-      [message]
+       [event]
+       name=turn 4
+       {SAURIAN_WARRIOR 8 42 Inarix}
+       {SAURIAN 8 42 Xortex}
+       {SAURIAN 8 42 Merlex}
+       {SAURIAN 8 42 Lagunax}
+       {SAURIAN 8 42 Lux}
+       {SAURIAN 8 42 Otomox}
+       {SAURIAN 8 42 Emax}
+       {SAURIAN 8 42 Fabix}
+       {SAURIAN 8 42 Morganx}
+       {SAURIAN 8 42 Stelianx}
+       [message]
        description="Inarix"
-       message= _ "Here we are, my friends.  Earl Lanbec'h and his kind is on 
our tails, we must hurry up."
-      [/message]
-    [/event]
-
-    [event]
-      first_time_only="no"
-      name="new turn"
-      [if]
+       message= _ "Here we are, my friends. Earl Lanbec'h and his kind is on 
our tails, we must hurry up."
+       [/message]
+       [/event]
+
+       [event]
+       first_time_only="no"
+       name="new turn"
+       [if]
        [variable]
-         equals="1"
-         name="saurians_safe"
+       equals="1"
+       name="saurians_safe"
        [/variable]
        [then]
-         {BRIDGE_EXPLODE}
-         [endlevel]
-           result=victory
-           bonus=yes
-         [/endlevel]
+       {BRIDGE_EXPLODE}
+               [endlevel]
+               result=victory
+               bonus=yes
+               [/endlevel]
        [/then]
-      [/if]
-      {CHECK_LIZARD_SAFE}
-      [if]
+       [/if]
+       {CHECK_LIZARD_SAFE}
+       [if]
        [variable]
-         greater_than="4"
-         name="i"
+       greater_than="4"
+       name="i"
        [/variable]
        [then]
-         [message]
-           description="Kapou'e"
-           message= _ "Hurry up!  The southern bridge is going to explode! 
Retreat! "
-         [/message]
-         [set_variable]
-           name="saurians_safe"
-           value="1"
-         [/set_variable]
+               [message]
+               description="Kapou'e"
+               message= _ "Hurry up! The southern bridge is going to explode! 
Retreat! "
+               [/message]
+               [set_variable]
+               name="saurians_safe"
+               value="1"
+               [/set_variable]
        [/then]
-      [/if]
-    [/event]
+       [/if]
+       [/event]
 
-    [event]
-      name=die
-      first_time_only=no
-      [filter]
+       [event]
+       name=die
+       first_time_only=no
+       [filter]
        type=Saurian
-      [/filter]
-      [command]
+       [/filter]
+       [command]
        [set_variable]
-         name=saurian_casualties
-         add=1
+       name=saurian_casualties
+       add=1
        [/set_variable]
-      [/command]
-      [command]
+       [/command]
+       [command]
        [if]
-         [variable]
-           name=saurian_casualties
-           numerical_equals=6
-         [/variable]
-         [then]
-           [message]
-             description="Kapou'e"
-             message= _ "We've had too much casualties to be able to resist to 
humans, we have no choice but surrender."
-           [/message]
-           [endlevel]
-             result=defeat
-           [/endlevel]
-         [/then]
+               [variable]
+               name=saurian_casualties
+               numerical_equals=6
+               [/variable]
+               [then]
+               [message]
+               description="Kapou'e"
+               message= _ "We've had too much casualties to be able to resist 
to humans, we have no choice but surrender."
+               [/message]
+               [endlevel]
+               result=defeat
+               [/endlevel]
+               [/then]
        [/if]
-      [/command]
-    [/event]
+       [/command]
+       [/event]
 
-    [event]
-      name=turn 8
-      [message]
-        description=Mkel
+       [event]
+       name=turn 8
+       [message]
+       description=Mkel
        message="This has taken too much time, we should send all of our troops 
and send theses creatures back to hell."
-      [/message]
-      [message]
-        description=Oumph
+       [/message]
+       [message]
+       description=Oumph
        message="It won't be said that Elves were braver than us, everyone to 
attack!"
-      [/message]
-      [modify_side]
-        side=2
+       [/message]
+       [modify_side]
+       side=2
        income=100
-      [/modify_side]
-      [modify_side]
-        side=3
+       [/modify_side]
+       [modify_side]
+       side=3
        income=100
-      [/modify_side]
-    [/event]
+       [/modify_side]
+       [/event]
 
-    [event]
-      name=time over
+       [event]
+       name=time over
 
-      {CHECK_LIZARD_SAFE}
-      [if]
+       {CHECK_LIZARD_SAFE}
+       [if]
        [variable]
-         greater_than="4"
-         name="i"
+       greater_than="4"
+       name="i"
        [/variable]
        [then]
-         {BRIDGE_EXPLODE}
-         [endlevel]
-           result=victory
-         [/endlevel] 
+       {BRIDGE_EXPLODE}
+               [endlevel]
+               result=victory
+               [/endlevel] 
        [/then]
        [else]
-         [unit]
-           type="General"
-           description="Earl Lanbec'h"
-           user_description= _ "Earl Lanbec'h"
-           side=2
-           x=8
-           y=42
-         [/unit]
-         {HEAVY_INFANTRYMAN 8 42}
-         {HEAVY_INFANTRYMAN 8 42}
-         {HEAVY_INFANTRYMAN 8 42}
-         {HEAVY_INFANTRYMAN 8 42}
-         {HEAVY_INFANTRYMAN 8 42}
-         {HEAVY_INFANTRYMAN 8 42}
-         {HEAVY_INFANTRYMAN 8 42}
-         [message]
-           speaker="Earl Lanbec'h"
-           message= _ "At the saurians! Rip them to the last!"
-         [/message]
-         [message]
-           speaker="Kapou'e"
-           message= _ "It is too late, we are defeated."
-         [/message]
+               [unit]
+               type="General"
+               description="Earl Lanbec'h"
+               user_description= _ "Earl Lanbec'h"
+               side=2
+               x=8
+               y=42
+               [/unit]
+               {HEAVY_INFANTRYMAN 8 42}
+               {HEAVY_INFANTRYMAN 8 42}
+               {HEAVY_INFANTRYMAN 8 42}
+               {HEAVY_INFANTRYMAN 8 42}
+               {HEAVY_INFANTRYMAN 8 42}
+               {HEAVY_INFANTRYMAN 8 42}
+               {HEAVY_INFANTRYMAN 8 42}
+               [message]
+               speaker="Earl Lanbec'h"
+               message= _ "At the saurians! Rip them to the last!"
+               [/message]
+               [message]
+               speaker="Kapou'e"
+               message= _ "It is too late, we are defeated."
+               [/message]
        [/else]
-      [/if]
-    [/event]
+       [/if]
+       [/event]
 
-    {scenarios/Son_Of_The_Black_Eye/deaths.cfg}
+       {scenarios/Son_Of_The_Black_Eye/deaths.cfg}
 
-  [/scenario]
+       [/scenario]
 
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg:1.24 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg:1.25
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg:1.24     
Mon Apr 11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg  Wed Apr 
13 11:55:32 2005
@@ -52,23 +52,23 @@
        recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer
        team_name=Kapoue
        gold=100
-       {BLACK_FLAG}
+       {BLACK_FLAG}
        [/side]
 
        [side]
-         race=Orc
-         type=Orcish Warlord
-         description=Shan Taum
-         user_description= _ "Shan Taum"
-         side=2
-         canrecruit=1
-               [ai]
-               recruitment_pattern=scout, scout, fighter, fighter, archer
+       race=Orc
+       type=Orcish Warlord
+       description=Shan Taum
+       user_description= _ "Shan Taum"
+       side=2
+       canrecruit=1
+               [ai]
+               recruitment_pattern=scout, scout, fighter, fighter, archer
                aggression=1.0
                [/ai]
-         recruit=Ogre, Orcish Crossbowman, Orcish Assassin, Wolf Rider
-         {GOLD 300, 350, 400}
-         {INCOME 45, 60, 90}
+       recruit=Ogre, Orcish Crossbowman, Orcish Assassin, Wolf Rider
+       {GOLD 300, 350, 400}
+       {INCOME 45, 60, 90}
        [/side]
 
        [story]
@@ -99,49 +99,49 @@
                [/recall]
        
 #              [message]
-#                speaker=narrator
-#                message= _ "This scenario is under construction but should 
mostly be playable."
+#              speaker=narrator
+#              message= _ "This scenario is under construction but should 
mostly be playable."
 #              [/message]
 
                [message]
-                 description="Kapou'e"
-                 message= _ "At last, here are the mourned hills!  I hope 
everything will be OK."
+               description="Kapou'e"
+               message= _ "At last, here are the mourned hills! I hope 
everything will be OK."
                [/message]
                [message]
-                 description="Grüü"
-                 message= _ "Why?"
+               description="Grüü"
+               message= _ "Why?"
                [/message]
                [message]
-                 description="Gork"
-                 message= _ "Only trolls don't know that these lands are ruled 
by Shan Taum the Smug, who was a rival for Black Eye Karun."
+               description="Gork"
+               message= _ "Only trolls don't know that these lands are ruled 
by Shan Taum the Smug, who was a rival for Black Eye Karun."
                [/message]
                [message]
-                 description="Pirk"
-                 message= _ "I doubt he would welcome the son of the Black 
Eye."
+               description="Pirk"
+               message= _ "I doubt he would welcome the son of the Black Eye."
                [/message]
                [message]
-                 description="Shan Taum"
-                 message= _ "Who is that?  Kapou'e!  What are you doing in my 
lands you ridiculous born loser?"
+               description="Shan Taum"
+               message= _ "Who is that? Kapou'e! What are you doing in my 
lands you ridiculous born loser?"
                [/message]
                [message]
-                 description="Kapou'e"
-                 message= _ "Hold on, Shan Taum. We are not here to quarrel, 
we are here to escort our brothers and to deliberate about what we have to do."
+               description="Kapou'e"
+               message= _ "Hold on, Shan Taum. We are not here to quarrel, we 
are here to escort our brothers and to deliberate about what we have to do."
                [/message]
                [message]
-                 description="Shan Taum"
-                 message= _ "Bwahaha!  You are nothing!  Where is your land?  
You became a beggar.  You are as pathetic as your father!"
+               description="Shan Taum"
+               message= _ "Bwahaha! You are nothing! Where is your land? You 
became a beggar. You are as pathetic as your father!"
                [/message]
                [message]
-                 description="Kapou'e"
-                 message= _ "How can you talk that way about my father, you 
miserable coward?!  I'll make a mug with your skull!"
+               description="Kapou'e"
+               message= _ "How can you talk that way about my father, you 
miserable coward?! I'll make a mug with your skull!"
                [/message]
                [message]
-                 description="Shan Taum"
-                 message= _ "Really?  What would you drink with it?  Mint 
cordial?"
+               description="Shan Taum"
+               message= _ "Really? What would you drink with it? Mint cordial?"
                [/message]
                [message]
-                 speaker="narrator"
-                 message= _ "Exasperated, Kapou'e launched an attack on his 
fellow orc Shan Taum the Smug."
+               speaker="narrator"
+               message= _ "Exasperated, Kapou'e launched an attack on his 
fellow orc Shan Taum the Smug."
                [/message]
 
        [/event]
@@ -159,57 +159,57 @@
                {OLD_ORCISH_SHAMAN 32 30 Klebar}
                {OLD_ORCISH_SHAMAN 32 30 Echarp}
                [message]
-                 description="Echarp"
-                 message= _ "What is this?  Are you mad!?  Humans are to 
besiege our fortress at Prestim and you are fighting each other!?"
+               description="Echarp"
+               message= _ "What is this? Are you mad!? Humans are to besiege 
our fortress at Prestim and you are fighting each other!?"
                [/message]
                [message]
-                 description="Kapou'e"
-                 message= _ "Well, ermmm..."
+               description="Kapou'e"
+               message= _ "Well, ermmm..."
                [/message]
                [message]
-                 description="Echarp"
-                 message= _ "Kapou'e, rumors tell you made a long trip to seek 
assistance from us, and escorting Pirk, Gork and Vraurk.  The council is 
grateful for that."
+               description="Echarp"
+               message= _ "Kapou'e, rumors tell you made a long trip to seek 
assistance from us, and escorting Pirk, Gork and Vraurk. The council is 
grateful for that."
                [/message]
                [message]
-                 description="Fabstep"
-                 message= _ "I know what you want from us but I'm afraid we 
can't help you."
+               description="Fabstep"
+               message= _ "I know what you want from us but I'm afraid we 
can't help you."
                [/message]
                [message]
-                 description="Kapou'e"
-                 message= _ "Really?  But my people..."
+               description="Kapou'e"
+               message= _ "Really? But my people..."
                [/message]
                [message]
-                 description="Echarp"
-                 message= _ "You don't understand.  Orcs have been divided for 
ages.  The only one who gave us some unity was your father, Black Eye Karun.  
Hearing rumors from your exploits, we understood you are a worthy son of your 
father."
+               description="Echarp"
+               message= _ "You don't understand. Orcs have been divided for 
ages. The only one who gave us some unity was your father, Black Eye Karun. 
Hearing rumors from your exploits, we understood you are a worthy son of your 
father."
                [/message]
                [message]
-                 description="Vraurk"
-                 message= _ "This is true.  Now we are pressured from all 
sides by humans and elves; we need a leader that can unite all banners.  This 
one is YOU!"
+               description="Vraurk"
+               message= _ "This is true. Now we are pressured from all sides 
by humans and elves; we need a leader that can unite all banners. This one is 
YOU!"
                [/message]
                [message]
-                 description="Kapou'e"
-                 message= _ "Well, I'm not sure I deserve that..."
+               description="Kapou'e"
+               message= _ "Well, I'm not sure I deserve that..."
                [/message]
                [message]
-                 description="Grüü"
-                 message= _ "Did you hear?  There is a battle waiting for us 
at Prestim!"
+               description="Grüü"
+               message= _ "Did you hear? There is a battle waiting for us at 
Prestim!"
                [/message]
                [message]
-                 description="Echarp"
-                 message= _ "Kapou'e, if Prestim falls, humans will have a 
strong bridgehead on this side of the river and your people won't be safe.  You 
are the only one that can help us defend Prestim!"
+               description="Echarp"
+               message= _ "Kapou'e, if Prestim falls, humans will have a 
strong bridgehead on this side of the river and your people won't be safe. You 
are the only one that can help us defend Prestim!"
                [/message]
                [message]
-                 description="Pirk"
-                 message= _ "Leave your people here Kapou'e--they are safe for 
the moment--and go defend Prestim.  In the meantime, now that the council is 
complete again, we will decide if we have to form the Great Horde again and 
give you the leadership on it."
+               description="Pirk"
+               message= _ "Leave your people here Kapou'e--they are safe for 
the moment--and go defend Prestim. In the meantime, now that the council is 
complete again, we will decide if we have to form the Great Horde again and 
give you the leadership on it."
                [/message]
                [kill]
-                 description="Pirk"
+               description="Pirk"
                [/kill]
                [kill]
-                 description="Gork"
+               description="Gork"
                [/kill]
                [kill]
-                 description="Vraurk"
+               description="Vraurk"
                [/kill]
        [/event]
 
@@ -219,8 +219,8 @@
                description="Shan Taum"
                [/filter]
                [message]
-                 description="Shan Taum"
-                 message= _ "Nooo!  Don't kill me, I surrender to you little 
earthworm."
+               description="Shan Taum"
+               message= _ "Nooo! Don't kill me, I surrender to you little 
earthworm."
                [/message]
                [endlevel]
                        result=victory
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg:1.22 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg:1.23
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg:1.22  Mon Apr 
11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg       Wed Apr 
13 11:55:32 2005
@@ -57,38 +57,38 @@
        recruit=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer
        team_name=Kapoue
        gold=100
-       {BLACK_FLAG}
+       {BLACK_FLAG}
        [/side]
 
        [side]
-         race=Elf
-         type=Elvish Shyde
-         description=Lucile
-         user_description= _ "Lucile"
-         side=2
-         team_name=elves
-         canrecruit=1
-               [ai]
+       race=Elf
+       type=Elvish Shyde
+       description=Lucile
+       user_description= _ "Lucile"
+       side=2
+       team_name=elves
+       canrecruit=1
+               [ai]
                aggression=-1.0
                [/ai]
-         recruit=Elvish Fighter, Elvish Captain, Elvish Scout, Elvish Shaman, 
Elvish Archer
-         {GOLD 80, 100, 120}
-         {INCOME 0, 4, 8}
+       recruit=Elvish Fighter, Elvish Captain, Elvish Scout, Elvish Shaman, 
Elvish Archer
+       {GOLD 80, 100, 120}
+       {INCOME 0, 4, 8}
        [/side]
 
        [side]
-         race=Elf
-         type=Elvish Captain
-         description=Raceme
-         user_description= _ "Raceme"
-         side=3
-         team_name=elves
-         canrecruit=1
-               [ai]
+       race=Elf
+       type=Elvish Captain
+       description=Raceme
+       user_description= _ "Raceme"
+       side=3
+       team_name=elves
+       canrecruit=1
+               [ai]
                aggression=1.0
                [/ai]
-         recruit=Elvish Fighter, Elvish Shaman, Elvish Archer
-         {GOLD 32, 50, 70}
+       recruit=Elvish Fighter, Elvish Shaman, Elvish Archer
+       {GOLD 32, 50, 70}
        [/side]
 
        [story]
@@ -122,29 +122,29 @@
                [/recall]
        
                [set_variable]
-                 name=moving_elves
-                 value=0
+               name=moving_elves
+               value=0
                [/set_variable]
 
                [message]
-                 description="Kapou'e"
-                 message= _ "So here is the Silent Forest ... why is it named 
that way?  Is it really that silent?"
+               description="Kapou'e"
+               message= _ "So here is the Silent Forest ... why is it named 
that way? Is it really that silent?"
                [/message]
                [message]
-                 description="Pirk"
-                 message= _ "It has not always been that silent.  A lot of 
hunters from tribes used to hunt there and fish in the Bork river.  But now, no 
one would enter there unless forced."
+               description="Pirk"
+               message= _ "It has not always been that silent. A lot of 
hunters from tribes used to hunt there and fish in the Bork river. But now, no 
one would enter there unless forced."
                [/message]
                [message]
-                 description="Vraurk"
-                 message= _ "Some people say these woods are haunted."
+               description="Vraurk"
+               message= _ "Some people say these woods are haunted."
                [/message]
                [message]
-                 description="Pirk"
-                 message= _ "The fact is that few people entered this forest 
and returned home safe.  Most likely, this forest is full of elvish renegades."
+               description="Pirk"
+               message= _ "The fact is that few people entered this forest and 
returned home safe. Most likely, this forest is full of elvish renegades."
                [/message]
                [message]
-                 description="Kapou'e"
-                 message= _ "Anyway, we need some rest.  We are sufficiently 
armed to cope with a bunch of elvish poachers.  If we ever meet some, I'll push 
them into the Bork river with great delight."
+               description="Kapou'e"
+               message= _ "Anyway, we need some rest. We are sufficiently 
armed to cope with a bunch of elvish poachers. If we ever meet some, I'll push 
them into the Bork river with great delight."
                [/message]
 
        [/event]
@@ -152,58 +152,58 @@
        [event]
        name=moveto
 
-         [message]
-           description="Lucile"
-           message= _ "What is that?  Orcs entering our forest?  Fools!  None 
of them will return alive!"
-         [/message]
-         [message]
-           description="Raceme"
-           message= _ "I agree.  We'll attack them on both sides."
-         [/message]
+       [message]
+       description="Lucile"
+       message= _ "What is that? Orcs entering our forest? Fools! None of them 
will return alive!"
+       [/message]
+       [message]
+       description="Raceme"
+       message= _ "I agree. We'll attack them on both sides."
+       [/message]
        
        [/event]
 
        [event]
        name=victory
                [message]
-                 description="Kapou'e"
-                 message= _ "We've done it!  Now we need some rest, before we 
continue our journey."
+               description="Kapou'e"
+               message= _ "We've done it! Now we need some rest, before we 
continue our journey."
                [/message]
        [/event]
 
        [event]
-         name=new turn
-         first_time_only=no
+       name=new turn
+       first_time_only=no
 
-         [command]
-         [if]
-           [have_unit]
+       [command]
+       [if]
+       [have_unit]
                x=1-9,10,11,12,13,14,15,16,17,18,19,20,21,22,18,19
                
y=1-30,1-28,1-27,1-15,1-15,1-23,1-21,1-19,1-18,6-17,6-16,6-15,8-15,10-12,1-3,1-2
                side=2,3
-           [/have_unit]
-           [then]
-           [/then]
-           [else]
-             [message]
-                 description="Grüü"
-                 message= _ "No more elves?  Where are you cowards!?"
-             [/message]
-             [message]
-                 description="Gork"
-                 message= _ "Don't shout that loud, stupid troll.  Do you 
remember we are in the Silent Forest?  Perhaps there more are to come."
-             [/message]
-             [message]
-                 description="Kapou'e"
-                 message= _ "I don't think so.  They must have fled.  Now that 
this forest has been cleared of elves, we can have a rest and then continue our 
journey."
-             [/message]
-             [endlevel]
+       [/have_unit]
+       [then]
+       [/then]
+       [else]
+       [message]
+               description="Grüü"
+               message= _ "No more elves? Where are you cowards!?"
+       [/message]
+       [message]
+               description="Gork"
+               message= _ "Don't shout that loud, stupid troll. Do you 
remember we are in the Silent Forest? Perhaps there more are to come."
+       [/message]
+       [message]
+               description="Kapou'e"
+               message= _ "I don't think so. They must have fled. Now that 
this forest has been cleared of elves, we can have a rest and then continue our 
journey."
+       [/message]
+       [endlevel]
                result=victory
                bonus=yes
-             [/endlevel]
-           [/else]
-         [/if]
-         [/command]
+       [/endlevel]
+       [/else]
+       [/if]
+       [/command]
 
        [/event]
 
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg
diff -u 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.21 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.22
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg:1.21 
Mon Apr 11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg      
Wed Apr 13 11:55:33 2005
@@ -111,9 +111,9 @@
        name=start
 
                [item]
-                 x=1
-                 y=14
-                 image=items/signpost.png
+               x=1
+               y=14
+               image=items/signpost.png
                [/item]
 
                [set_variable]
@@ -160,7 +160,7 @@
                [/message]
                [message]
                        description=Kapou'e
-                       message= _ "Oh no!  They are besieged by elves.  We 
must help our brothers to get rid of this mob.  But these filthy elves are so 
numerous."
+                       message= _ "Oh no! They are besieged by elves. We must 
help our brothers to get rid of this mob. But these filthy elves are so 
numerous."
                [/message]
                [message]
                        description=Grüü
@@ -172,7 +172,7 @@
                [/message]
                [message]
                        description=Grüü
-                       message= _ "We go and we kill all of them.  What do you 
think?"
+                       message= _ "We go and we kill all of them. What do you 
think?"
                [/message]
                [message]
                        description=Kapou'e
@@ -192,28 +192,28 @@
                [/removeitem]
 
                [filter]
-                 side=1
-                 x=7
-                 y=30
+               side=1
+               x=7
+               y=30
                [/filter]
 
                [unit]
-                 description=Jetto
-                 user_description= _ "Jetto"
-                 side=1
-                 type=Orcish Assassin
-                 x=7
-                 y=30
+               description=Jetto
+               user_description= _ "Jetto"
+               side=1
+               type=Orcish Assassin
+               x=7
+               y=30
                [/unit]
 
                [allow_recruit]
-                 side=1
-                 type=Orcish Assassin
+               side=1
+               type=Orcish Assassin
                [/allow_recruit]
 
                [message]
-                 description=Jetto
-                 message= _ "Freedom!  Many thanks, Son of The Black Eye.  I'm 
Jetto, master of assassins, now you can count on the assassins guild to help 
you in your quest!"
+               description=Jetto
+               message= _ "Freedom! Many thanks, Son of The Black Eye. I'm 
Jetto, master of assassins, now you can count on the assassins guild to help 
you in your quest!"
                [/message]
        [/event]
 
@@ -224,19 +224,19 @@
                [filter]
                type=Elvish Fighter
                [/filter]
-               [command]
-               [set_variable]
-               name=elvish_casualties
-               add=1
-               [/set_variable]
+               [command]
+       [set_variable]
+       name=elvish_casualties
+       add=1
+       [/set_variable]
                [/command]
                [command]
                [if]
-               [variable]
-                       name=elvish_casualties
-                       numerical_equals=6
-               [/variable]
-               [then]
+       [variable]
+               name=elvish_casualties
+               numerical_equals=6
+       [/variable]
+       [then]
                        [role]
                        role=shaman
                        type=Orcish Shaman,Old Orcish Shaman,Novice Orcish 
Shaman
@@ -247,19 +247,19 @@
                        [/message]
                        [message]
                        description=Kapou'e
-                       message= _ "We're not out of the woods yet.  I can see 
that more are pouring from the forest.  We are not in safety."
+                       message= _ "We're not out of the woods yet. I can see 
that more are pouring from the forest. We are not in safety."
                        [/message]
                        [message]
                        role=shaman
-                       message= _ "You are right, we have to go to a safer 
place.  You have helped us.  Would you help us again and escort us to the 
Harbour of Tirigaz?"
+                       message= _ "You are right, we have to go to a safer 
place. You have helped us. Would you help us again and escort us to the Harbour 
of Tirigaz?"
                        [/message]
                        [message]
                        description=Kapou'e
-                       message= _ "Yes, I need to ask for assistance from 
whole council.  I'm with you."
+                       message= _ "Yes, I need to ask for assistance from 
whole council. I'm with you."
                        [/message]
                        [message]
                        role=shaman
-                       message= _ "Excellent.  This is a dangerous journey, as 
we have to take a road near the elvish forest.  This is the road near that 
yellow farm."
+                       message= _ "Excellent. This is a dangerous journey, as 
we have to take a road near the elvish forest. This is the road near that 
yellow farm."
                        [/message]
                [/then]
                [/if]
@@ -272,19 +272,19 @@
                [filter]
                type=Elvish Archer
                [/filter]
-               [command]
-               [set_variable]
-               name=elvish_casualties
-               add=1
-               [/set_variable]
+               [command]
+       [set_variable]
+       name=elvish_casualties
+       add=1
+       [/set_variable]
                [/command]
                [command]
                [if]
-               [variable]
-                       name=elvish_casualties
-                       numerical_equals=6
-               [/variable]
-               [then]
+       [variable]
+               name=elvish_casualties
+               numerical_equals=6
+       [/variable]
+       [then]
                        [role]
                        role=shaman
                        type=Orcish Shaman,Old Orcish Shaman,Novice Orcish 
Shaman
@@ -295,19 +295,19 @@
                        [/message]
                        [message]
                        description=Kapou'e
-                       message= _ "Yes, but I can see that more are pouring 
from the forest.  We are not in safety."
+                       message= _ "Yes, but I can see that more are pouring 
from the forest. We are not in safety."
                        [/message]
                        [message]
                        role=shaman
-                       message= _ "You are right, we have to leave to a safer 
place.  You have helped us.  Would you help us again and escort us to the 
Harbour of Tirigaz?"
+                       message= _ "You are right, we have to leave to a safer 
place. You have helped us. Would you help us again and escort us to the Harbour 
of Tirigaz?"
                        [/message]
                        [message]
                        description=Kapou'e
-                       message= _ "Yes, I need to ask for assistance to the 
whole council.  I'm with you."
+                       message= _ "Yes, I need to ask for assistance to the 
whole council. I'm with you."
                        [/message]
                        [message]
                        role=shaman
-                       message= _ "Excellent.  This is a dangerous journey, as 
we have to take a road near the elvish forest.  This is the road near this 
yellow farm."
+                       message= _ "Excellent. This is a dangerous journey, as 
we have to take a road near the elvish forest. This is the road near this 
yellow farm."
                        [/message]
                [/then]
                [/if]
@@ -315,99 +315,100 @@
        [/event]
 
        [event]
-          first_time_only="no"
-          name="moveto"
-          [filter]
-             type="Orcish Shaman,Old Orcish Shaman,Novice Orcish Shaman"
-             x="1"
-             y="13-14"
-          [/filter]
-          [set_variable]
-             add="1"
-             name="num_pilgrims"
-          [/set_variable]
-          [if]
-            [variable]
-             name=num_pilgrims
-             numerical_equals=3
-            [/variable]
-            [then]
-               [message]
-                 speaker=unit
-                 message= _ "We're safe, finally.  Hurry up Kapou'e, come with 
us, we need to reach Tirigaz as soon as possible."
-               [/message]
-           [/then]
-          [/if]
-          [kill]
-             type="Orcish Shaman,Old Orcish Shaman,Novice Orcish Shaman"
-             x="1"
-             y="13-14"
-          [/kill]
+       first_time_only="no"
+       name="moveto"
+       [filter]
+       type="Orcish Shaman,Old Orcish Shaman,Novice Orcish Shaman"
+       x="1"
+       y="13-14"
+       [/filter]
+       [set_variable]
+       add="1"
+       name="num_pilgrims"
+       [/set_variable]
+       [if]
+               [variable]
+               name=num_pilgrims
+               numerical_equals=3
+               [/variable]
+               [then]
+                       [message]
+                       speaker=unit
+                       message= _ "We're safe, finally. Hurry up Kapou'e, come 
with us, we need to reach Tirigaz as soon as possible."
+                       [/message]
+               [/then]
+       [/if]
+       [kill]
+       type="Orcish Shaman,Old Orcish Shaman,Novice Orcish Shaman"
+       x="1"
+       y="13-14"
+       [/kill]
        [/event]
 
        [event]
-          name="moveto"
-          [filter]
-             type=Orcish Shaman,Old Orcish Shaman,Novice Orcish Shaman
-             x="1-5"
-             y="11-16"
-          [/filter]
-          {ELVISH_ARCHER 2 11}
-          {ELVISH_ARCHER 3 16}
-          {ELVISH_FIGHTER 6 14}
-
-         [unit]
-           type=Elvish Fighter
-           side=2
-           description="Filiel"
-           user_description= _ "Filiel"
-           x=2
-           y=13
-         [/unit]
+       name="moveto"
+       [filter]
+       type=Orcish Shaman,Old Orcish Shaman,Novice Orcish Shaman
+       x="1-5"
+       y="11-16"
+       [/filter]
+       {ELVISH_ARCHER 2 11}
+       {ELVISH_ARCHER 3 16}
+       {ELVISH_FIGHTER 6 14}
+
+       [unit]
+       type=Elvish Fighter
+       side=2
+       description="Filiel"
+       user_description= _ "Filiel"
+       x=2
+       y=13
+       [/unit]
        
-         [message]
+       [message]
                description="Filiel"
-               message= _ "Aha!  Surprise!  You thought you could cross elvish 
lands safely!"
-         [/message]
+               message= _ "Aha! Surprise! You thought you could cross elvish 
lands safely!"
+       [/message]
        [/event]
        
        [event]
        first_time_only=no
        name=moveto
-               [filter]
-               description=Kapou'e
+               [filter]
+               description=Kapou'e
                x=1
                y=13-14
                [/filter]
-          [if]
-            [variable] #if num_pilgrims >= 3 then victory
-            name=num_pilgrims
-            numerical_equals=3
-            [/variable]
-            [then]
-               [message]
-               speaker=unit
-               message= _ "We've made it!  Our journey is still long.  Hurry 
up, my people!"
-               [/message]
-                [endlevel]
-                result=victory
-               bonus=yes
-                [/endlevel]
-            [/then]
-        [/if] 
+       [if]
+               [variable]
+               #if num_pilgrims >= 3 then victory
+               name=num_pilgrims
+               numerical_equals=3
+               [/variable]
+               [then]
+                       [message]
+                       speaker=unit
+                       message= _ "We've made it! Our journey is still long. 
Hurry up, my people!"
+                       [/message]
+                       [endlevel]
+                       result=victory
+                       bonus=yes
+                       [/endlevel]
+               [/then]
+       [/if]
        [/event]
        
        [event]
        name=moveto
-           [filter]
-           side=1,3
-           x=1,2,3,2-3
-           y=26-27,25-26,26,27
-           [/filter]
-           [command]
+       [filter]
+       side=1,3
+       x=1,2,3,2-3
+       y=26-27,25-26,26,27
+       [/filter]
+       [command]
                [message]
                        speaker=Etheliel
-                       message= _ "They are destroying our castle!  To my 
rescue my merry Elves!"
+                       message= _ "They are destroying our castle! To my 
rescue my merry Elves!"
                [/message]
                {ELVISH_HERO 1 26}
                {ELVISH_MARKSMAN 1 27}
@@ -415,13 +416,13 @@
                {ELVISH_MARKSMAN 3 25}
                [role]
                role=hero
-               type=Elvish Hero
-               [/role]
+               type=Elvish Hero
+               [/role]
                [message]
                        role=hero
-                       message= _ "At your service, Etheliel.  Let push these 
evil creatures back to their quag!"
+                       message= _ "At your service, Etheliel. Let push these 
evil creatures back to their quag!"
                [/message]
-           [/command]
+       [/command]
        
        [/event]
 
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg
diff -u 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg:1.21 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg:1.22
--- 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg:1.21  
    Mon Apr 11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg   
Wed Apr 13 11:55:33 2005
@@ -70,7 +70,7 @@
        recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer
        team_name=Kapoue
        gold=100
-        {BLACK_FLAG}
+       {BLACK_FLAG}
        [/side]
 
        [side]
@@ -170,11 +170,11 @@
                
                [message]
                        description="Vraurk"
-                       message= _ "Ahhh, I'm so tired.  It was a good idea to 
halt in such a quiet place."
+                       message= _ "Ahhh, I'm so tired. It was a good idea to 
halt in such a quiet place."
                [/message]
                [message]
                        description="Grüü"
-                       message= _ "It is too quiet.  Just plain boring."
+                       message= _ "It is too quiet. Just plain boring."
                [/message]
                [message]
                        description="Pirk"
@@ -182,11 +182,11 @@
                [/message]
                [message]
                        description="Kapou'e"
-                       message= _ "You're right.  I can see something is 
moving in these hills.  Looks like there are undead there."
+                       message= _ "You're right. I can see something is moving 
in these hills. Looks like there are undead there."
                [/message]
                [message]
                        description="Grüü"
-                       message= _ "Excellent!  It is time for exercise!"
+                       message= _ "Excellent! It is time for exercise!"
                [/message]
 
        [/event]
@@ -201,7 +201,7 @@
                [/filter]
                [message]
                speaker=unit
-               message= _ "Hmmm, what neat bottle!  What is it?"
+               message= _ "Hmmm, what neat bottle! What is it?"
                [/message]
                [message]
                speaker=unit
@@ -222,19 +222,19 @@
        [/event]
 
        [event]
-         name=turn 17
-         [message]
-           description="Grüü"
-           message= _ "The day is coming, these night creatures will soon 
return to the pit."
-         [/message]
-         [message]
-           description="Pirk"
-           message= _ "Grüü, are you forgeting we are ALSO night creatures?"
-         [/message]
-         [message]
-           description="Grüü"
-           message= _ "Err... well..."
-         [/message]
+       name=turn 17
+       [message]
+       description="Grüü"
+       message= _ "The day is coming, these night creatures will soon return 
to the pit."
+       [/message]
+       [message]
+       description="Pirk"
+       message= _ "Grüü, are you forgeting we are ALSO night creatures?"
+       [/message]
+       [message]
+       description="Grüü"
+       message= _ "Err... well..."
+       [/message]
        [/event]
 
        {scenarios/Son_Of_The_Black_Eye/deaths.cfg}
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg
diff -u 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:1.26 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:1.27
--- 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:1.26  
    Mon Apr 11 22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg   
Wed Apr 13 11:55:33 2005
@@ -69,7 +69,7 @@
        recruit= Wolf Rider, Orcish Grunt, Orcish Archer
        team_name=Kapoue
        gold=100
-        {BLACK_FLAG}
+       {BLACK_FLAG}
        [/side]
 
        [side]
@@ -114,11 +114,11 @@
        name=start
                [message]
                description=Kapou'e
-               message= _ "We have nearly crossed the mountains.  I feel the 
lands of the free tribes are near now.  But beware, there are dwarves and wild 
trolls around.  Hurry up!  I can see the sign post that indicates their land."
+               message= _ "We have nearly crossed the mountains. I feel the 
lands of the free tribes are near now. But beware, there are dwarves and wild 
trolls around. Hurry up! I can see the sign post that indicates their land."
                [/message]
                [message]
                description=Kwili
-               message= _ "What are these orcs doing here?  They should be too 
tired to live."
+               message= _ "What are these orcs doing here? They should be too 
tired to live."
                [/message]
        [/event]
 
@@ -172,15 +172,15 @@
 
                [message]
                description=Blemaker
-               message= _ "Look!  Dwarves are fighting against orcs!"
+               message= _ "Look! Dwarves are fighting against orcs!"
                [/message]
                [message]
                description=Grüü
-               message= _ "Father, we should help them.  Orcs are our allies."
+               message= _ "Father, we should help them. Orcs are our allies."
                [/message]
                [message]
                description=Blemaker
-               message= _ "I don't know if we should do that.  Orcs have been 
our allies in the past, but they have always treated us as fools."
+               message= _ "I don't know if we should do that. Orcs have been 
our allies in the past, but they have always treated us as fools."
                [/message]
                [message]
                description=Grüü
@@ -188,7 +188,7 @@
                [/message]
                [message]
                description=Blemaker
-               message= _ "You are right, my son.  We will help our orcish 
friends.  But take care of you ... I would be desperate if something would 
happen to you."
+               message= _ "You are right, my son. We will help our orcish 
friends. But take care of you ... I would be desperate if something would 
happen to you."
                [/message]
 
                [objectives]
@@ -219,7 +219,7 @@
                [/filter]
                [message]
                speaker=unit
-               message= _ "Argh!  I'm done.  My people is doomed!"
+               message= _ "Argh! I'm done. My people is doomed!"
                [/message]
                [endlevel]
                result=defeat
@@ -233,11 +233,11 @@
                [/filter]
                [message]
                description=Grüü
-               message= _ "Father!  Oh no!"
+               message= _ "Father! Oh no!"
                [/message]
                [message]
                description=Grüü
-               message= _ "Filthy dwarves!  Now I'm to kill you to the last!"
+               message= _ "Filthy dwarves! Now I'm to kill you to the last!"
                [/message]
        [/event]
 
@@ -257,7 +257,7 @@
                [then]
                        [message]
                        description=Blemaker
-                       message= _ "My son!  I should have never brought him to 
this fight.  Now we are to return to our caverns, and we will never go back."
+                       message= _ "My son! I should have never brought him to 
this fight. Now we are to return to our caverns, and we will never go back."
                        [/message]
                        [endlevel]
                        result=defeat
@@ -266,7 +266,7 @@
                [/if]
                [message]
                        description=Kapou'e
-                       message= _ "Our troll friends are over.  Without them 
there is no hope."
+                       message= _ "Our troll friends are over. Without them 
there is no hope."
                [/message]
                [endlevel]
                        result=defeat
@@ -280,7 +280,7 @@
                [/filter]
                [message]
                speaker=unit
-               message= _ "Argh!  I die!"
+               message= _ "Argh! I die!"
                [/message]
        [/event]
 
@@ -306,43 +306,43 @@
                [then]
                        [message]
                        description=Kapou'e
-                       message= _ "We've succeeded!  We've passed through the 
Mountains of Haag!  Look at these green hills!  The land of the free tribes is 
near now.  I can see the walls of Barag-Gor in the distance."
+                       message= _ "We've succeeded! We've passed through the 
Mountains of Haag! Look at these green hills! The land of the free tribes is 
near now. I can see the walls of Barag-Gor in the distance."
                        [/message]
                        [message]
                        description=Kapou'e
-                       message= _ "Blemaker, many thanks for your help in this 
fight.  Would you like to join us in our journey with your son?  Your help 
would be very appreciated!"
+                       message= _ "Blemaker, many thanks for your help in this 
fight. Would you like to join us in our journey with your son? Your help would 
be very appreciated!"
                        [/message]
 
                        [message]
                        description=Grüü
-                       message= _ "Father, I'd like to join them.  Would you 
mind it?"
+                       message= _ "Father, I'd like to join them. Would you 
mind it?"
                        [/message]
                        [message]
                        description=Blemaker
-                       message= _ "My son, you're old enough to discover the 
world.  Me, I have to stay here.  But take care, there are plenty of creatures 
that seek our end, like elves or humans.  They are as clever as merciless."
+                       message= _ "My son, you're old enough to discover the 
world. Me, I have to stay here. But take care, there are plenty of creatures 
that seek our end, like elves or humans. They are as clever as merciless."
                        [/message]
                        [message]
                        description=Grüü
-                       message= _ "Thanks, father.  Don't worry, I'll take 
care of myself."
+                       message= _ "Thanks, father. Don't worry, I'll take care 
of myself."
                        [/message]
                [/then]
                [else]
                        [message]
                        description=Kapou'e
-                       message= _ "We've succeeded!  We've passed through the 
Mountains of Haag!  Look at these green hills!  The land of the free tribes is 
near now.  I can see the walls of Barag-Gor in the distance."
+                       message= _ "We've succeeded! We've passed through the 
Mountains of Haag! Look at these green hills! The land of the free tribes is 
near now. I can see the walls of Barag-Gor in the distance."
                        [/message]
                        [message]
                        description=Kapou'e
-                       message= _ "Grüü, many thanks for your help in this 
fight.  I'm sorry for your father.  Would you like to join us in our journey?  
Your help would be very appreciated!"
+                       message= _ "Grüü, many thanks for your help in this 
fight. I'm sorry for your father. Would you like to join us in our journey? 
Your help would be very appreciated!"
                        [/message]
                        [message]
                        description=Grüü
-                       message= _ "My father would have come to help you.  I 
would insult his memory not to help you.  I come!"
+                       message= _ "My father would have come to help you. I 
would insult his memory not to help you. I come!"
                        [/message]
                [/else]
                [/if]
                [kill]
-                 description=Blemaker
+               description=Blemaker
                [/kill]
                [store_unit]
                [filter]
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:1.7 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:1.8
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:1.7  Mon Apr 11 
22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/deaths.cfg      Wed Apr 13 
11:55:33 2005
@@ -11,11 +11,11 @@
        [/filter]
        [message]
        speaker=unit
-       message= _ "Ouch!  This hurts!"
+       message= _ "Ouch! This hurts!"
        [/message]
        [message]
        description="Kapou'e"
-       message= _ "The council will never be complete again.  This is 
hopeless."
+       message= _ "The council will never be complete again. This is hopeless."
        [/message]
        {DEFEAT}
 [/event]
@@ -27,11 +27,11 @@
        [/filter]
        [message]
        speaker=unit
-       message= _ "Ouch!  This hurts!"
+       message= _ "Ouch! This hurts!"
        [/message]
        [message]
        description="Kapou'e"
-       message= _ "The council will never be complete again.  This is 
hopeless."
+       message= _ "The council will never be complete again. This is hopeless."
        [/message]
        {DEFEAT}
 [/event]
@@ -43,11 +43,11 @@
        [/filter]
        [message]
        speaker=unit
-       message= _ "Ouch!  This hurts!"
+       message= _ "Ouch! This hurts!"
        [/message]
        [message]
        description="Kapou'e"
-       message= _ "The council will never be complete again.  This is 
hopeless."
+       message= _ "The council will never be complete again. This is hopeless."
        [/message]
        {DEFEAT}
 [/event]
@@ -59,11 +59,11 @@
        [/filter]
        [message]
        speaker=unit
-       message= _ "Ouch!  This hurts!"
+       message= _ "Ouch! This hurts!"
        [/message]
        [message]
        description="Kapou'e"
-       message= _ "The council will never be complete again.  This is 
hopeless."
+       message= _ "The council will never be complete again. This is hopeless."
        [/message]
        {DEFEAT}
 [/event]
@@ -75,7 +75,7 @@
        [/filter]
        [message]
        speaker=unit
-       message= _ "Argh!  I'm done.  My people is doomed!"
+       message= _ "Argh! I'm done. My people is doomed!"
        [/message]
        {DEFEAT}
 [/event]
@@ -95,26 +95,13 @@
 [event]
 name=die
        [filter]
-       description=Grüü
+       description=Inarix
        [/filter]
        [message]
-       speaker=unit
-       message= _ "Oh no, I'm defeated."
-       [/message]
-       {DEFEAT}
-[/event]
-
-[event]
-      name=die
-      [filter]
-        description=Inarix
-      [/filter]
-      [message]
        description="Kapou'e"
        message= _ "Without Inarix to lead his saurians, there is no hope."
-      [/message]
-      [endlevel]
+       [/message]
+       [endlevel]
        result=defeat
-      [/endlevel]
+       [/endlevel]
 [/event]
-
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg:1.11 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg:1.12
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg:1.11  Mon Apr 11 
22:13:19 2005
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/story.cfg       Wed Apr 13 
11:55:33 2005
@@ -1,28 +1,28 @@
 [story]
 
-  [part]
-       story= _ "Rahul I, King of Wesnoth, concluded peace with orcs in the 
4th year of his reign.  He ended a 15 year war with Black Eye Karun, ruler of 
the orcs.  A peace treaty defined which lands were devoted to orcs or humans.  
Years that followed the treaty were prosperous."
+[part]
+       story= _ "Rahul I, King of Wesnoth, concluded peace with orcs in the 
4th year of his reign. He ended a 15 year war with Black Eye Karun, ruler of 
the orcs. A peace treaty defined which lands were devoted to orcs or humans. 
Years that followed the treaty were prosperous."
        background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
-  [/part]
+[/part]
 
-  [part]
-       story= _ "In the thirteenth year of Howgarth III, tension began to rise 
between Orcish tribes and human northern earldoms.  Famine led humans to 
colonize some orcish lands and to push orcs to desolated hills."
+[part]
+       story= _ "In the thirteenth year of Howgarth III, tension began to rise 
between Orcish tribes and human northern earldoms. Famine led humans to 
colonize some orcish lands and to push orcs to desolated hills."
        background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
-  [/part]
+[/part]
 
-  [part]
-       story= _ "Of course, this caused violent orcish riots as orcs 
systematically slaughtered human colonies and villages that were on their 
lands.  Then, earl Lanbec'h decided to definitively address the Orcish menace 
and conferred a small army to his son-in-law baron Albert."
+[part]
+       story= _ "Of course, this caused violent orcish riots as orcs 
systematically slaughtered human colonies and villages that were on their 
lands. Then, earl Lanbec'h decided to definitively address the Orcish menace 
and conferred a small army to his son-in-law baron Albert."
        background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
-  [/part]
+[/part]
 
-  [part]
+[part]
        story= _ "Baron Albert personally led a small vanguard with the mission 
to establish a bridgehead inside Orcish lands."
        background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
-  [/part]
+[/part]
 
-  [part]
+[part]
        story= _ "By nightfall his troops reached a mountainous territory, 
under the authority of orcish leader Kapou'e, the son of the Black Eye."
        background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
-  [/part]
+[/part]
 
 [/story]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.18 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.19
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.18        Sun Apr 
 3 04:54:02 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg     Wed Apr 13 
11:55:33 2005
@@ -334,7 +334,7 @@
                [/message]
                [message]
                        description=Prince Haldric
-                       message= _ "There are many Wesfolk amongst the remains 
of my people. We must stay  united under one banner. I will need you by my side 
if there is any hope of building a true 'Kingdom of Wesnoth'. Come, we have 
much work to do."
+                       message= _ "There are many Wesfolk amongst the remains 
of my people. We must stay united under one banner. I will need you by my side 
if there is any hope of building a true 'Kingdom of Wesnoth'. Come, we have 
much work to do."
                [/message]
                [message]
                        description=Lady Jessica
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.31 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.32
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.31       
Fri Apr  1 21:38:04 2005
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg    Wed Apr 
13 11:55:33 2005
@@ -241,7 +241,7 @@
                                [/message]
                                [message]
                                        description=Prince Haldric
-                                       message= _ "Uh-huh.  Have you 
considered that the unholy act of turning your best and brightest into undead 
is what causes them to fall into darkness?"
+                                       message= _ "Uh-huh. Have you considered 
that the unholy act of turning your best and brightest into undead is what 
causes them to fall into darkness?"
                                [/message]
                                [message]
                                        description=Lady Outlaw
Index: wesnoth/data/scenarios/multiplayer/Clash.cfg
diff -u wesnoth/data/scenarios/multiplayer/Clash.cfg:1.1 
wesnoth/data/scenarios/multiplayer/Clash.cfg:1.2
--- wesnoth/data/scenarios/multiplayer/Clash.cfg:1.1    Tue Mar 22 23:43:40 2005
+++ wesnoth/data/scenarios/multiplayer/Clash.cfg        Wed Apr 13 11:55:33 2005
@@ -2,7 +2,7 @@
        id=multiplayer_clash
        name= _ "Clash"
        map_data="{maps/multiplayer/Clash}"
-       description= _ "Small map for 2v2.   Teams should be player 1 and 3, vs 
player 2 and 4.  Recommended setting of 2 gold per village."
+       description= _ "Small map for 2v2. Teams should be player 1 and 3, vs 
player 2 and 4. Recommended setting of 2 gold per village."
        turns=90
 
        {DAWN}
Index: wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg
diff -u wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:1.4 
wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:1.5
--- wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:1.4    Thu Nov 
18 13:07:35 2004
+++ wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg        Wed Apr 
13 11:55:33 2005
@@ -2,7 +2,7 @@
        id=ranmap4
        name= _ "Random map (Marsh)"
        turns=90
-       description= _ "A random map with swamp as the primary terrain.  Note: 
random maps are often unbalanced, but if you have time, you can regenerate them 
until you get a good one."
+       description= _ "A random map with swamp as the primary terrain. Note: 
random maps are often unbalanced, but if you have time, you can regenerate them 
until you get a good one."
 
        {DAWN}
        {MORNING}
Index: wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg
diff -u wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg:1.6 
wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg:1.7
--- wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg:1.6   Sun Jan 
 2 21:40:32 2005
+++ wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg       Wed Apr 
13 11:55:33 2005
@@ -1,7 +1,7 @@
 [multiplayer]
        id=ranmap3
        name= _ "Random map (Winter)"
-       description= _ "A random map set in the break between spring and 
winter, mainly with snowy terrains.  Note: random maps are often unbalanced, 
but if you have time, you can regenerate them until you get a good one."
+       description= _ "A random map set in the break between spring and 
winter, mainly with snowy terrains. Note: random maps are often unbalanced, but 
if you have time, you can regenerate them until you get a good one."
        turns=90
 
        {DAWN}
Index: wesnoth/data/units/Ancient_Wose.cfg
diff -u wesnoth/data/units/Ancient_Wose.cfg:1.13 
wesnoth/data/units/Ancient_Wose.cfg:1.14
--- wesnoth/data/units/Ancient_Wose.cfg:1.13    Tue Apr  5 16:22:24 2005
+++ wesnoth/data/units/Ancient_Wose.cfg Wed Apr 13 11:55:33 2005
@@ -14,7 +14,7 @@
 advanceto=null
 undead_variation=wose
 cost=120
-unit_description= _ "Terrible and awe-inspiring, the most ancient of woses 
grow to a tremendous size.  They are a thing rarely seen outside of legend, 
wherein they are said to kick aside their enemies like sticks and feathers, and 
to possess an unearthly strength, crushing the greatest of boulders into 
powder, as though all the strength of a tree to grow and split through stone 
over the course of years was brought to bear in a mere moment.  These same 
legends speak of their tireless stewardship of the forests of the world, the 
desecration of which is often the only thing which could incur the wrath of 
these otherwise kind and curious beings."
+unit_description= _ "Terrible and awe-inspiring, the most ancient of woses 
grow to a tremendous size. They are a thing rarely seen outside of legend, 
wherein they are said to kick aside their enemies like sticks and feathers, and 
to possess an unearthly strength, crushing the greatest of boulders into 
powder, as though all the strength of a tree to grow and split through stone 
over the course of years was brought to bear in a mere moment. These same 
legends speak of their tireless stewardship of the forests of the world, the 
desecration of which is often the only thing which could incur the wrath of 
these otherwise kind and curious beings."
 usage=fighter
        [attack]
        name=crush
Index: wesnoth/data/units/Bone_Shooter.cfg
diff -u wesnoth/data/units/Bone_Shooter.cfg:1.19 
wesnoth/data/units/Bone_Shooter.cfg:1.20
--- wesnoth/data/units/Bone_Shooter.cfg:1.19    Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Bone_Shooter.cfg Wed Apr 13 11:55:33 2005
@@ -12,7 +12,7 @@
 alignment=chaotic
 advanceto=Soul Shooter
 cost=24
-unit_description= _ "These, whose masters have found to be more potent 
creations, have been outfitted with a truly vile arsenal.  Their quivers are 
filled with shafts made not of wood, but of the bones of their victims.  Dubbed 
simply 'Bone-Shooters' by their unfortunate enemies, these abominations are a 
terror to all who live."
+unit_description= _ "These, whose masters have found to be more potent 
creations, have been outfitted with a truly vile arsenal. Their quivers are 
filled with shafts made not of wood, but of the bones of their victims. Dubbed 
simply 'Bone-Shooters' by their unfortunate enemies, these abominations are a 
terror to all who live."
 usage=archer
 get_hit_sound=skeleton-hit.wav
        [resistance]
Index: wesnoth/data/units/Draug.cfg
diff -u wesnoth/data/units/Draug.cfg:1.3 wesnoth/data/units/Draug.cfg:1.4
--- wesnoth/data/units/Draug.cfg:1.3    Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Draug.cfg        Wed Apr 13 11:55:33 2005
@@ -13,7 +13,7 @@
 advanceto=null
 cost=60
 usage=fighter
-unit_description= _ "Towering remains of what once were legendary warriors, 
the Draug strike fear in the hearts of all who oppose them.  They are driven 
not by malice, but are forever bound within the dream of unlife, wandering 
through the greatest battles of their memory, and fighting desperately for 
release, for a peace bought only by strength of arms.  The memory of their 
enemy, and the purpose of their struggle have long faded into oblivion."
+unit_description= _ "Towering remains of what once were legendary warriors, 
the Draug strike fear in the hearts of all who oppose them. They are driven not 
by malice, but are forever bound within the dream of unlife, wandering through 
the greatest battles of their memory, and fighting desperately for release, for 
a peace bought only by strength of arms. The memory of their enemy, and the 
purpose of their struggle have long faded into oblivion."
 get_hit_sound=skeleton-hit.wav
        [resistance]
        blade=60
Index: wesnoth/data/units/Elvish_Sorceress.cfg
diff -u wesnoth/data/units/Elvish_Sorceress.cfg:1.5 
wesnoth/data/units/Elvish_Sorceress.cfg:1.6
--- wesnoth/data/units/Elvish_Sorceress.cfg:1.5 Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Elvish_Sorceress.cfg     Wed Apr 13 11:55:33 2005
@@ -8,9 +8,9 @@
 image_defensive_long="elvish-sorceress-ranged-defend.png"
 hitpoints=41
 movement_type=woodland
-    [resistance]
-    cold=90
-    [/resistance]
+[resistance]
+       cold=90
+[/resistance]
 movement=5
 experience=100
 level=2
@@ -18,7 +18,7 @@
 advanceto=Elvish Enchantress
 cost=60
 usage=mixed fighter
-unit_description= _ "Eschewing the study of healing in favor of more 
aggressive uses of magic, Elvish Sorceresses have become quite proficient at 
ranged combat.  Their entangling attack is notably more effective than before, 
and they can call upon bursts of chilling ethereal wind to smite those who 
oppose them."
+unit_description= _ "Eschewing the study of healing in favor of more 
aggressive uses of magic, Elvish Sorceresses have become quite proficient at 
ranged combat. Their entangling attack is notably more effective than before, 
and they can call upon bursts of chilling ethereal wind to smite those who 
oppose them."
 get_hit_sound=female-hit.wav
 
        [attack]
Index: wesnoth/data/units/Elvish_Sylph.cfg
diff -u wesnoth/data/units/Elvish_Sylph.cfg:1.5 
wesnoth/data/units/Elvish_Sylph.cfg:1.6
--- wesnoth/data/units/Elvish_Sylph.cfg:1.5     Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Elvish_Sylph.cfg Wed Apr 13 11:55:33 2005
@@ -7,9 +7,9 @@
 image_defensive="elvish-sylph-defend.png"
 hitpoints=55
 movement_type=woodlandfloat
-    [resistance]
-    cold=70
-    [/resistance]
+[resistance]
+       cold=70
+[/resistance]
 movement=6
 experience=500
 level=4
@@ -17,7 +17,7 @@
 advanceto=null
 cost=150
 usage=mixed fighter
-unit_description= _ "Elvish Sylphs are scions of beauty in the mortal plane.  
Having fully developed their faerie side, they transform into creatures of both 
worlds, wielding powerful magic against their enemies."
+unit_description= _ "Elvish Sylphs are scions of beauty in the mortal plane. 
Having fully developed their faerie side, they transform into creatures of both 
worlds, wielding powerful magic against their enemies."
 get_hit_sound=female-hit.wav
 
        [attack]
Index: wesnoth/data/units/Grand_Marshal.cfg
diff -u wesnoth/data/units/Grand_Marshal.cfg:1.6 
wesnoth/data/units/Grand_Marshal.cfg:1.7
--- wesnoth/data/units/Grand_Marshal.cfg:1.6    Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Grand_Marshal.cfg        Wed Apr 13 11:55:33 2005
@@ -18,7 +18,7 @@
 cost=150
 ability=leadership
 usage=fighter
-unit_description= _ "The rank of Grand Marshal is one of the most esteemed in 
the armies of humanity, and those who bear its title have surpassed many trials 
by fire, proving their considerable mettle at both personal combat and tactical 
facility.  Their presence on the battlefield is of great aid to those serving 
beneath them."
+unit_description= _ "The rank of Grand Marshal is one of the most esteemed in 
the armies of humanity, and those who bear its title have surpassed many trials 
by fire, proving their considerable mettle at both personal combat and tactical 
facility. Their presence on the battlefield is of great aid to those serving 
beneath them."
 get_hit_sound=groan.wav
        [attack]
        name=sword
Index: wesnoth/data/units/Javelineer.cfg
diff -u wesnoth/data/units/Javelineer.cfg:1.2 
wesnoth/data/units/Javelineer.cfg:1.3
--- wesnoth/data/units/Javelineer.cfg:1.2       Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Javelineer.cfg   Wed Apr 13 11:55:33 2005
@@ -13,7 +13,7 @@
 advanceto=null
 cost=32
 usage=fighter
-unit_description= _ "Javelineers have mastered the use of the pointy sticks 
they were given as recruits.  Dangerous in melee, they have also developed 
their skill at throwing their javelins, making them potent in both demesnes of 
combat.  Because of the length of their spears, they strike first in melee, 
even when defending."
+unit_description= _ "Javelineers have mastered the use of the pointy sticks 
they were given as recruits. Dangerous in melee, they have also developed their 
skill at throwing their javelins, making them potent in both demesnes of 
combat. Because of the length of their spears, they strike first in melee, even 
when defending."
 get_hit_sound=groan.wav
        [attack]
        name=spear
Index: wesnoth/data/units/Mermaid_Diviner.cfg
diff -u wesnoth/data/units/Mermaid_Diviner.cfg:1.7 
wesnoth/data/units/Mermaid_Diviner.cfg:1.8
--- wesnoth/data/units/Mermaid_Diviner.cfg:1.7  Tue Apr  5 16:22:24 2005
+++ wesnoth/data/units/Mermaid_Diviner.cfg      Wed Apr 13 11:55:33 2005
@@ -11,11 +11,11 @@
 ability=illuminates,cures
 hitpoints=41
 movement_type=swimmer
-    [resistance]
-    blade=110
-    pierce=110
-    holy=70
-    [/resistance]
+[resistance]
+       blade=110
+       pierce=110
+       holy=70
+[/resistance]
 movement=6
 experience=500
 level=3
@@ -24,7 +24,7 @@
 undead_variation=swimmer
 cost=120
 usage=healer
-unit_description= _ "The most devout and pious amongst the mermaids gain the 
striking power of illumination, which prevents their surroundings from ever 
seeing true night.  Their power is a stalwart counter to the forces of 
darkness."
+unit_description= _ "The most devout and pious amongst the mermaids gain the 
striking power of illumination, which prevents their surroundings from ever 
seeing true night. Their power is a stalwart counter to the forces of darkness."
 get_hit_sound=mermen-hit.wav
        [attack]
        name=staff
Index: wesnoth/data/units/Mermaid_Initiate.cfg
diff -u wesnoth/data/units/Mermaid_Initiate.cfg:1.10 
wesnoth/data/units/Mermaid_Initiate.cfg:1.11
--- wesnoth/data/units/Mermaid_Initiate.cfg:1.10        Tue Apr 12 06:35:08 2005
+++ wesnoth/data/units/Mermaid_Initiate.cfg     Wed Apr 13 11:55:33 2005
@@ -15,7 +15,7 @@
 undead_variation=swimmer
 cost=19
 usage=mixed fighter
-unit_description= _ "Young Mermaids are often initiated in the water magics of 
their people.  Despite their frailty, this makes them formidable opponents, as 
they can call upon the very water about them to smite their enemies."
+unit_description= _ "Young Mermaids are often initiated in the water magics of 
their people. Despite their frailty, this makes them formidable opponents, as 
they can call upon the very water about them to smite their enemies."
 get_hit_sound=mermen-hit.wav
        [attack]
        name=staff
Index: wesnoth/data/units/Mermaid_Priestess.cfg
diff -u wesnoth/data/units/Mermaid_Priestess.cfg:1.6 
wesnoth/data/units/Mermaid_Priestess.cfg:1.7
--- wesnoth/data/units/Mermaid_Priestess.cfg:1.6        Tue Apr  5 16:22:24 2005
+++ wesnoth/data/units/Mermaid_Priestess.cfg    Wed Apr 13 11:55:33 2005
@@ -10,10 +10,10 @@
 ability=cures
 hitpoints=31
 movement_type=swimmer
-    [resistance]
-    blade=110
-    pierce=110
-    [/resistance]
+[resistance]
+       blade=110
+       pierce=110
+[/resistance]
 movement=6
 experience=150
 level=2
@@ -22,7 +22,7 @@
 undead_variation=swimmer
 cost=80
 usage=healer
-unit_description= _ "The more learned among the mermaids often take a path of 
holy study.  This leaves them quite capable of ministering to the wounds of 
their comrades, as well as being a potent defense against the unworldly."
+unit_description= _ "The more learned among the mermaids often take a path of 
holy study. This leaves them quite capable of ministering to the wounds of 
their comrades, as well as being a potent defense against the unworldly."
 get_hit_sound=mermen-hit.wav
        [attack]
        name=staff
Index: wesnoth/data/units/Merman_Hoplite.cfg
diff -u wesnoth/data/units/Merman_Hoplite.cfg:1.7 
wesnoth/data/units/Merman_Hoplite.cfg:1.8
--- wesnoth/data/units/Merman_Hoplite.cfg:1.7   Tue Apr  5 16:22:24 2005
+++ wesnoth/data/units/Merman_Hoplite.cfg       Wed Apr 13 11:55:33 2005
@@ -6,21 +6,21 @@
 image_defensive="merman-hoplite-defend.png"
 hitpoints=52
 movement_type=swimmer
-    [defense]
-    castle=50
-    grassland=80
-    forest=90
-    hills=80
-    village=70
-    [/defense]
+[defense]
+       castle=50
+       grassland=80
+       forest=90
+       hills=80
+       village=70
+[/defense]
 # The following resistance adjustments are to slightly downpower steadfast, 
yet keep the effect of it only activating during defense.  There is no 
adjustment for holy because attacking living units with holy should not be 
potent.
-    [resistance]
-    blade=110
-    pierce=110
-    cold=70
-    fire=120
-    impact=100
-    [/resistance]
+[resistance]
+       blade=110
+       pierce=110
+       cold=70
+       fire=120
+       impact=100
+[/resistance]
 movement=5
 experience=500
 ability=steadfast
@@ -30,7 +30,7 @@
 undead_variation=swimmer
 cost=100
 usage=fighter
-unit_description= _ "With their towering shields, the Merman Hoplites form the 
elite guard of the watery realm.  Their powerful armor and rigid discipline 
allow them to hold a steadfast line against the rages of battle.  In times of 
desperation, they can even do so on land, though not nearly as well as a 
creature with legs."
+unit_description= _ "With their towering shields, the Merman Hoplites form the 
elite guard of the watery realm. Their powerful armor and rigid discipline 
allow them to hold a steadfast line against the rages of battle. In times of 
desperation, they can even do so on land, though not nearly as well as a 
creature with legs."
 get_hit_sound=mermen-hit.wav
        [attack]
        name=trident
Index: wesnoth/data/units/Merman_Warrior.cfg
diff -u wesnoth/data/units/Merman_Warrior.cfg:1.6 
wesnoth/data/units/Merman_Warrior.cfg:1.7
--- wesnoth/data/units/Merman_Warrior.cfg:1.6   Tue Apr  5 16:22:24 2005
+++ wesnoth/data/units/Merman_Warrior.cfg       Wed Apr 13 11:55:33 2005
@@ -6,9 +6,9 @@
 image_defensive="merman-warrior-defend.png"
 hitpoints=48
 movement_type=swimmer
-    [defense]
-    castle=50
-    [/defense]
+[defense]
+       castle=50
+[/defense]
 movement=6
 experience=80
 level=2
@@ -17,7 +17,7 @@
 undead_variation=swimmer
 cost=40
 usage=fighter
-unit_description= _ "The Mermen Warriors form the core of the mermen armies.  
Wielding powerful tridents, they are a bane to any who dare enter their waters."
+unit_description= _ "The Mermen Warriors form the core of the mermen armies. 
Wielding powerful tridents, they are a bane to any who dare enter their waters."
 get_hit_sound=mermen-hit.wav
        [attack]
        name=trident
Index: wesnoth/data/units/Naga-Fighter.cfg
diff -u wesnoth/data/units/Naga-Fighter.cfg:1.6 
wesnoth/data/units/Naga-Fighter.cfg:1.7
--- wesnoth/data/units/Naga-Fighter.cfg:1.6     Tue Apr  5 16:22:24 2005
+++ wesnoth/data/units/Naga-Fighter.cfg Wed Apr 13 11:55:33 2005
@@ -15,7 +15,7 @@
 undead_variation=swimmer
 cost=14
 usage=fighter
-unit_description= _ "The serpentine naga are one of the few races capable of 
any meaningful mobility in water, giving them a whole world forbidden to land 
dwellers.  Still, they are not true creatures of the sea, and their inability 
to breathe water leaves them in trepidation of the abyss.  They are small, and 
somewhat frail in form, but often much more nimble than their opponents."
+unit_description= _ "The serpentine naga are one of the few races capable of 
any meaningful mobility in water, giving them a whole world forbidden to land 
dwellers. Still, they are not true creatures of the sea, and their inability to 
breathe water leaves them in trepidation of the abyss. They are small, and 
somewhat frail in form, but often much more nimble than their opponents."
 get_hit_sound=hiss.wav
        [attack]
        name=sword
@@ -33,40 +33,40 @@
                sound=sword-swish.wav
                [/sound]
        [/attack]
-        
-        [female]
-        id=Naga Fighter
-        name= _ "Nagini Fighter"
-        race=naga
-        gender=female
-        image="naga-fighter+female.png"
-        image_defensive="naga-fighter+female-defend.png"
-        hitpoints=30
-        movement_type=naga
-        movement=7
-        experience=25
-        level=1
-        alignment=neutral
-        advanceto=Naga Warrior
-        cost=13
-        usage=fighter
-        unit_description= _ "The serpentine naga are one of the few races 
capable of any meaningful mobility in water, giving them a whole world 
forbidden to land dwellers.  Still, they are not true creatures of the sea, and 
their inability to breathe water leaves them in trepidation of the abyss.  They 
are small, and somewhat frail in form, but often much more nimble than their 
opponents."
-        get_hit_sound=hiss.wav
-                [attack]
-                name=sword
-                type=blade
-                range=short
-                damage=4
-                number=4
-                        [frame]
-                        begin=-90
-                        end=100
-                        image="naga-fighter+female-attack.png"
+
+       [female]
+       id=Naga Fighter
+       name= _ "Nagini Fighter"
+       race=naga
+       gender=female
+       image="naga-fighter+female.png"
+       image_defensive="naga-fighter+female-defend.png"
+       hitpoints=30
+       movement_type=naga
+       movement=7
+       experience=25
+       level=1
+       alignment=neutral
+       advanceto=Naga Warrior
+       cost=13
+       usage=fighter
+       unit_description= _ "The serpentine naga are one of the few races 
capable of any meaningful mobility in water, giving them a whole world 
forbidden to land dwellers. Still, they are not true creatures of the sea, and 
their inability to breathe water leaves them in trepidation of the abyss. They 
are small, and somewhat frail in form, but often much more nimble than their 
opponents."
+       get_hit_sound=hiss.wav
+               [attack]
+               name=sword
+               type=blade
+               range=short
+               damage=4
+               number=4
+                       [frame]
+                       begin=-90
+                       end=100
+                       image="naga-fighter+female-attack.png"
                        [/frame]
                        [sound]
                        time=-90
                        sound=sword-swish.wav
                        [/sound]
-               [/attack]
-        [/female]
+               [/attack]
+       [/female]
 [/unit]
Index: wesnoth/data/units/Naga-Myrmidon.cfg
diff -u wesnoth/data/units/Naga-Myrmidon.cfg:1.4 
wesnoth/data/units/Naga-Myrmidon.cfg:1.5
--- wesnoth/data/units/Naga-Myrmidon.cfg:1.4    Tue Apr  5 16:22:24 2005
+++ wesnoth/data/units/Naga-Myrmidon.cfg        Wed Apr 13 11:55:33 2005
@@ -7,10 +7,10 @@
 image_defensive="naga-myrmidon-defend.png"
 hitpoints=49
 movement_type=naga
-    [defense]
-    grassland=50
-    sand=40
-    [/defense]
+[defense]
+       grassland=50
+       sand=40
+[/defense]
 movement=7
 experience=500
 level=3
@@ -19,7 +19,7 @@
 undead_variation=swimmer
 cost=90
 usage=fighter
-unit_description= _ "The most practiced of the naga blademasters are initiated 
into the caste of the Myrmidon, masters of their twin-bladed art.  They strike 
as fast as the snakes which they resemble, and dance away from attacks with 
grace.  Not only are they potent enemies on any open terrain, but their ability 
to swim allows them a deadly mobility."
+unit_description= _ "The most practiced of the naga blademasters are initiated 
into the caste of the Myrmidon, masters of their twin-bladed art. They strike 
as fast as the snakes which they resemble, and dance away from attacks with 
grace. Not only are they potent enemies on any open terrain, but their ability 
to swim allows them a deadly mobility."
 get_hit_sound=hiss.wav
        [attack]
        name=sword
@@ -37,44 +37,44 @@
                sound=sword-swish.wav
                [/sound]
        [/attack]
-        
-        [female]
-        id=Naga Myrmidon
-        name= _ "Nagini Myrmidon"
-        race=naga
-        gender=female
-        image="naga-myrmidon+female.png"
-        image_defensive="naga-myrmidon+female-defend.png"
-        hitpoints=49
-        movement_type=naga
-            [defense]
-            grassland=50
-            sand=40
-            [/defense]
-        movement=7
-        experience=500
-        level=3
-        alignment=neutral
-        advanceto=null
-        cost=90
-        usage=fighter
-        unit_description= _ "The most practiced of the nagini blademasters are 
initiated into the caste of the Myrmidon, masters of their twin-bladed art.  
They strike as fast as the snakes which they resemble, and dance away from 
attacks with grace.  Not only are they potent enemies on any open terrain, but 
their ability to swim allows them a deadly mobility."
-        get_hit_sound=hiss.wav
-                [attack]
-                name=sword
-                type=blade
-                range=short
-                damage=8
-                number=6
-                        [frame]
-                        begin=-50
-                        end=80
-                        image="naga-myrmidon+female-attack.png"
-                        [/frame]
+
+       [female]
+       id=Naga Myrmidon
+       name= _ "Nagini Myrmidon"
+       race=naga
+       gender=female
+       image="naga-myrmidon+female.png"
+       image_defensive="naga-myrmidon+female-defend.png"
+       hitpoints=49
+       movement_type=naga
+       [defense]
+               grassland=50
+               sand=40
+       [/defense]
+       movement=7
+       experience=500
+       level=3
+       alignment=neutral
+       advanceto=null
+       cost=90
+       usage=fighter
+       unit_description= _ "The most practiced of the nagini blademasters are 
initiated into the caste of the Myrmidon, masters of their twin-bladed art. 
They strike as fast as the snakes which they resemble, and dance away from 
attacks with grace. Not only are they potent enemies on any open terrain, but 
their ability to swim allows them a deadly mobility."
+       get_hit_sound=hiss.wav
+               [attack]
+               name=sword
+               type=blade
+               range=short
+               damage=8
+               number=6
+                       [frame]
+                       begin=-50
+                       end=80
+                       image="naga-myrmidon+female-attack.png"
+                       [/frame]
                        [sound]
                        time=-50
                        sound=sword-swish.wav
                        [/sound]
-             [/attack]
-        [/female]
+               [/attack]
+       [/female]
 [/unit]
Index: wesnoth/data/units/Naga-Warrior.cfg
diff -u wesnoth/data/units/Naga-Warrior.cfg:1.4 
wesnoth/data/units/Naga-Warrior.cfg:1.5
--- wesnoth/data/units/Naga-Warrior.cfg:1.4     Tue Apr  5 16:22:24 2005
+++ wesnoth/data/units/Naga-Warrior.cfg Wed Apr 13 11:55:33 2005
@@ -7,10 +7,10 @@
 image_defensive="naga-warrior-defend.png"
 hitpoints=40
 movement_type=naga
-    [defense]
-    grassland=60
-    sand=50
-    [/defense]
+[defense]
+       grassland=60
+       sand=50
+[/defense]
 movement=7
 experience=70
 level=2
@@ -19,7 +19,7 @@
 undead_variation=swimmer
 cost=40
 usage=fighter
-unit_description= _ "Many of the young warriors of the naga aspire for the day 
when they merit their second blade.  Their martial practice of using twin 
blades is wholly unlike that of the Orcs and other races, for they have begun 
to learn the art of using their serpentine form to best effect, twisting and 
turning to dodge from blows.  This makes them potent on land, but the friction 
of water greatly impedes their ability to do this."
+unit_description= _ "Many of the young warriors of the naga aspire for the day 
when they merit their second blade. Their martial practice of using twin blades 
is wholly unlike that of the Orcs and other races, for they have begun to learn 
the art of using their serpentine form to best effect, twisting and turning to 
dodge from blows. This makes them potent on land, but the friction of water 
greatly impedes their ability to do this."
 get_hit_sound=mermen-hit.wav
        [attack]
        name=sword
@@ -37,44 +37,44 @@
                sound=sword-swish.wav
                [/sound]
        [/attack]
-        
-        [female]
-        id=Naga Warrior
-        name= _ "Nagini Warrior"
-        race=naga
-        gender=female
-        image="naga-warrior+female.png"
-        image_defensive="naga-warrior+female-defend.png"
-        hitpoints=40
-        movement_type=naga
-            [defense]
-            grassland=60
-            sand=50
-            [/defense]
-        movement=7
-        experience=70
-        level=2
-        alignment=neutral
-        advanceto=Naga Myrmidon
-        cost=40
-        usage=fighter
-        unit_description= _ "Many of the young warriors of the naga aspire for 
the day when they merit their second blade.  Their martial practice of using 
twin blades is wholly unlike that of the Orcs and other races, for they have 
begun to learn the art of using their serpentine form to best effect, twisting 
and turning to dodge from blows.  This makes them potent on land, but the 
friction of water greatly impedes their ability to do this."
-        get_hit_sound=hiss.wav
-                [attack]
-                name=sword
-                type=blade
-                range=short
-                damage=6
-                number=5
-                        [frame]
-                        begin=-50
-                        end=100
-                        image="naga-warrior+female-attack.png"
-                        [/frame]
+
+       [female]
+       id=Naga Warrior
+       name= _ "Nagini Warrior"
+       race=naga
+       gender=female
+       image="naga-warrior+female.png"
+       image_defensive="naga-warrior+female-defend.png"
+       hitpoints=40
+       movement_type=naga
+       [defense]
+               grassland=60
+               sand=50
+       [/defense]
+       movement=7
+       experience=70
+       level=2
+       alignment=neutral
+       advanceto=Naga Myrmidon
+       cost=40
+       usage=fighter
+       unit_description= _ "Many of the young warriors of the naga aspire for 
the day when they merit their second blade. Their martial practice of using 
twin blades is wholly unlike that of the Orcs and other races, for they have 
begun to learn the art of using their serpentine form to best effect, twisting 
and turning to dodge from blows. This makes them potent on land, but the 
friction of water greatly impedes their ability to do this."
+       get_hit_sound=hiss.wav
+               [attack]
+               name=sword
+               type=blade
+               range=short
+               damage=6
+               number=5
+                       [frame]
+                       begin=-50
+                       end=100
+                       image="naga-warrior+female-attack.png"
+                       [/frame]
                [sound]
                time=-50
                sound=sword-swish.wav
                [/sound]
-                [/attack]
-        [/female]
+               [/attack]
+       [/female]
 [/unit]
Index: wesnoth/data/units/Orcish_Leader.cfg
diff -u wesnoth/data/units/Orcish_Leader.cfg:1.4 
wesnoth/data/units/Orcish_Leader.cfg:1.5
--- wesnoth/data/units/Orcish_Leader.cfg:1.4    Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Orcish_Leader.cfg        Wed Apr 13 11:55:33 2005
@@ -15,7 +15,7 @@
 advanceto=Orcish Ruler
 cost=120
 usage=mixed fighter
-unit_description= _ "Orcish Rulers are the chiefs of their tribe. They make 
the important decisions and lead their people into battle.  They carry a bow 
out of necessity, but are much more skilled with the sword; all in all, they 
are powerful fighters.  Their natural leadership skills make them very precious 
in the battle: if the Ruler is lost, so is the battle."
+unit_description= _ "Orcish Rulers are the chiefs of their tribe. They make 
the important decisions and lead their people into battle. They carry a bow out 
of necessity, but are much more skilled with the sword; all in all, they are 
powerful fighters. Their natural leadership skills make them very precious in 
the battle: if the Ruler is lost, so is the battle."
 get_hit_sound=orc-hit.wav
        [attack]
        name=sword
Index: wesnoth/data/units/Orcish_Ruler.cfg
diff -u wesnoth/data/units/Orcish_Ruler.cfg:1.12 
wesnoth/data/units/Orcish_Ruler.cfg:1.13
--- wesnoth/data/units/Orcish_Ruler.cfg:1.12    Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Orcish_Ruler.cfg Wed Apr 13 11:55:33 2005
@@ -15,7 +15,7 @@
 advanceto=Orcish Sovereign
 cost=120
 usage=mixed fighter
-unit_description= _ "Orcish Rulers are the chiefs of their tribe. They make 
the important decisions and lead their people into battle.  They carry a bow 
out of necessity, but are much more skilled with the sword; all in all, they 
are powerful fighters.  Their natural leadership skills make them very precious 
in the battle: if the Ruler is lost, so is the battle."
+unit_description= _ "Orcish Rulers are the chiefs of their tribe. They make 
the important decisions and lead their people into battle. They carry a bow out 
of necessity, but are much more skilled with the sword; all in all, they are 
powerful fighters. Their natural leadership skills make them very precious in 
the battle: if the Ruler is lost, so is the battle."
 get_hit_sound=orc-hit.wav
        [attack]
        name=sword
Index: wesnoth/data/units/Orcish_Sovereign.cfg
diff -u wesnoth/data/units/Orcish_Sovereign.cfg:1.5 
wesnoth/data/units/Orcish_Sovereign.cfg:1.6
--- wesnoth/data/units/Orcish_Sovereign.cfg:1.5 Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Orcish_Sovereign.cfg     Wed Apr 13 11:55:33 2005
@@ -15,7 +15,7 @@
 advanceto=null
 cost=120
 usage=mixed fighter
-unit_description= _ "Orcish Sovereign are the chiefs of their tribe. They make 
the important decisions and lead their people into battle.  They carry a bow 
out of necessity, but are much more skilled with the sword; all in all, they 
are powerful fighters.  Their natural leadership skills make them very precious 
in the battle: if the Ruler is lost, so is the battle."
+unit_description= _ "Orcish Sovereign are the chiefs of their tribe. They make 
the important decisions and lead their people into battle. They carry a bow out 
of necessity, but are much more skilled with the sword; all in all, they are 
powerful fighters. Their natural leadership skills make them very precious in 
the battle: if the Ruler is lost, so is the battle."
 get_hit_sound=orc-hit.wav
        [attack]
        name=sword
Index: wesnoth/data/units/Soul_Shooter.cfg
diff -u wesnoth/data/units/Soul_Shooter.cfg:1.6 
wesnoth/data/units/Soul_Shooter.cfg:1.7
--- wesnoth/data/units/Soul_Shooter.cfg:1.6     Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Soul_Shooter.cfg Wed Apr 13 11:55:33 2005
@@ -12,7 +12,7 @@
 alignment=chaotic
 advanceto=null
 cost=34
-unit_description= _ "The most powerful of the undead archers invariably end up 
being those who were themselves archers in their previous life.  They wander 
the fields of battle, guided by the fading memory of their former skill, 
neither knowing, nor caring what their purpose, or foes be.  They are driven 
only by a malice borne of the anguish of their empty and incoherent existence."
+unit_description= _ "The most powerful of the undead archers invariably end up 
being those who were themselves archers in their previous life. They wander the 
fields of battle, guided by the fading memory of their former skill, neither 
knowing, nor caring what their purpose, or foes be. They are driven only by a 
malice borne of the anguish of their empty and incoherent existence."
 usage=archer
 get_hit_sound=skeleton-hit.wav
        [resistance]




reply via email to

[Prev in Thread] Current Thread [Next in Thread]