Author: esr
Date: Sun Mar 2 19:07:16 2008
New Revision: 24226
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24226&view=rev
Log:
Address FR in bug #10940. (Change for both 1.4 and 1.5)
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg?rev=24226&r1=24225&r2=24226&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
Sun Mar 2 19:07:16 2008
@@ -144,9 +144,9 @@
[event]
name=time over
- {OLD_ORCISH_SHAMAN 32 30 Fabstep ""}
- {OLD_ORCISH_SHAMAN 32 30 Klebar ""}
- {OLD_ORCISH_SHAMAN 32 30 Echarp ""}
+ {OLD_ORCISH_SHAMAN 32 30 Fabstep _"Fabstep"}
+ {OLD_ORCISH_SHAMAN 32 30 Klebar _"Klebar"}
+ {OLD_ORCISH_SHAMAN 32 30 Echarp _"Echarp""}
# wmllint: recognize Fabstep
# wmllint: recognize Klebar
# wmllint: recognize Echarp
@@ -219,9 +219,9 @@
message= _ "Nooo! Don't kill me, I surrender to you little
earthworm."
[/message]
- {OLD_ORCISH_SHAMAN 32 30 Fabstep ""}
- {OLD_ORCISH_SHAMAN 32 30 Klebar ""}
- {OLD_ORCISH_SHAMAN 32 30 Echarp ""}
+ {OLD_ORCISH_SHAMAN 32 30 Fabstep _"Fabstep"}
+ {OLD_ORCISH_SHAMAN 32 30 Klebar _"Klebar"}
+ {OLD_ORCISH_SHAMAN 32 30 Echarp _"Echarp"}
# wmllint: recognize Fabstep
# wmllint: recognize Klebar
# wmllint: recognize Echarp
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg?rev=24226&r1=24225&r2=24226&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
Sun Mar 2 19:07:16 2008
@@ -1441,7 +1441,7 @@
y=42,43,43,44
[/move_unit_fake]
- {FREE_UNIT (Javelineer) (Bernard) ( _ "Bernard") 2 33 44}
+ {FREE_UNIT (Javelineer) (Bellerin) ( _ "Bellerin") 2 33 44}
[redraw]
[/redraw]
@@ -1452,7 +1452,7 @@
y=42,43,43,44
[/move_unit_fake]
- {FREE_UNIT (Swordsman) (Daryl) ( _ "Daryl") 2 34 44}
+ {FREE_UNIT (Swordsman) (Durth) ( _ "Durth") 2 34 44}
[redraw]
[/redraw]
@@ -1463,7 +1463,7 @@
y=42,43,43
[/move_unit_fake]
- {FREE_UNIT (Bowman) (Oswald) ( _ "Oswald") 2 34 43}
+ {FREE_UNIT (Bowman) (Othgar) ( _ "Othgar") 2 34 43}
[redraw]
[/redraw]
@@ -1478,7 +1478,7 @@
y=42,43,43,44
[/move_unit_fake]
- {FREE_UNIT (Javelineer) (Bernard) ( _ "Bernard") 2 33 44}
+ {FREE_UNIT (Javelineer) (Bellerin) ( _ "Bellerin") 2 33 44}
[redraw]
[/redraw]
@@ -1489,7 +1489,7 @@
y=42,43,43,44
[/move_unit_fake]
- {FREE_UNIT (Swordsman) (Daryl) ( _ "Daryl") 2 34 44}
+ {FREE_UNIT (Swordsman) (Durth) ( _ "Durth") 2 34 44}
[redraw]
[/redraw]
@@ -1500,7 +1500,7 @@
y=42,43,43
[/move_unit_fake]
- {FREE_UNIT (Longbowman) (Oswald) ( _ "Oswald") 2 34 43}
+ {FREE_UNIT (Longbowman) (Othgar) ( _ "Othgar") 2 34 43}
[redraw]
[/redraw]
@@ -1515,7 +1515,7 @@
y=42,43,43,44
[/move_unit_fake]
- {FREE_UNIT (Javelineer) (Bernard) ( _ "Bernard") 2 33 44}
+ {FREE_UNIT (Javelineer) (Bellerin) ( _ "Bellerin") 2 33 44}
[redraw]
[/redraw]
@@ -1526,7 +1526,7 @@
y=42,43,43,44
[/move_unit_fake]
- {FREE_UNIT (Swordsman) (Daryl) ( _ "Daryl") 2 34 44}
+ {FREE_UNIT (Swordsman) (Durth) ( _ "Durth") 2 34 44}
[redraw]
[/redraw]
@@ -1537,24 +1537,24 @@
y=42,43,43
[/move_unit_fake]
- {FREE_UNIT (Master Bowman) (Oswald) ( _ "Oswald") 2 34 43}
+ {FREE_UNIT (Master Bowman) (Othgar) ( _ "Othgar") 2 34 43}
[redraw]
[/redraw]
#endif
- # wmllint: recognize Bernard
- # wmllint: recognize Daryl
- # wmllint: recognize Oswald
-
-
- [message]
- description=Daryl
+ # wmllint: recognize Bellerin
+ # wmllint: recognize Durth
+ # wmllint: recognize Othgar
+
+
+ [message]
+ description=Durth
message= _ "Huff, huff. First the boss tells us to patrol these
caves, and then these durn caves start flooding. What next?"
[/message]
[message]
- description=Bernard
+ description=Bellerin
message= _ "Shut up and keep running, or we'll be fishbait for
sure!"
[/message]
@@ -1579,29 +1579,29 @@
[/set_variable]
[message]
- description=Oswald
+ description=Othgar
message= _ "Hey look! Those must be Elves!"
[/message]
[message]
- description=Daryl
+ description=Durth
message= _ "Huh? Elves?"
[/message]
[message]
- description=Bernard
+ description=Bellerin
message= _ "Yeah, just like my old grandmam used to tell
us: pointy ears, pale hair, those shifty eyes, hearts as hard as a hermit
crab's shell. It must be an invasion, they must have started the flood!"
[/message]
[/then]
[else]
[message]
- description=Oswald
+ description=Othgar
message= _ "Hey look! It's a $ally_race"
[/message]
[message]
- description=Daryl
+ description=Durth
message= _ "Huh? A $ally_race?"
[/message]
@@ -1618,7 +1618,7 @@
[/set_variable]
[message]
- description=Bernard
+ description=Bellerin
message= _ "Yeah, just like my old grandmam used
to tell us: dark green skin, beady red eyes, hulking brutes with brains as
small as a barnacle. They lurk deep in the earth and hate everything that lives
above ground. This must be an invasion, the trolls must have started the flood!"
[/message]
[/then]
@@ -1630,7 +1630,7 @@
[/set_variable]
[message]
- description=Bernard
+ description=Bellerin
message= _ "Yeah, just like my old grandmam used
to tell us: short and stocky, long beards, filthy bastards who are as sneaky as
a cuttlefish. They lurk underground and only come up to steal whatever
valuables they can get their hands on. This must part of their plot, the
dwarves must have started the flood!"
[/message]
[/else]
@@ -1641,12 +1641,12 @@
{CLEAR_VARIABLE unittest}
[message]
- description=Oswald
+ description=Othgar
message= _ "Then let's kill them!"
[/message]
[message]
- description=Daryl
+ description=Durth
message= _ "Yeah!"
[/message]
@@ -3824,7 +3824,7 @@
side=1
[/remove_shroud]
- # this command is to keep Daryl, Oswald, and Bernard's death counter
+ # this command is to keep Durth, Othgar, and Bellerin's death counter
# from firing once side 2 humans start dying
[set_variable]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
