Author: esr
Date: Thu Mar 20 23:45:52 2008
New Revision: 24917
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24917&view=rev
Log:
Name changes preparatory to addressing bug #11318.
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg
trunk/data/tools/wesnoth/wmltools.py
trunk/src/wesconfig.h
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
Thu Mar 20 23:45:52 2008
@@ -202,8 +202,8 @@
[side]
type=Elvish Champion
- id=Mkel
- name= _ "Mkel"
+ id=Thelarion
+ name= _ "Thelarion"
side=2
canrecruit=yes
[ai]
@@ -222,8 +222,8 @@
[side]
type=Dwarvish Steelclad
- id=Oumph
- name= _ "Oumph"
+ id=Darstang
+ name= _ "Darstang"
side=3
canrecruit=yes
[ai]
@@ -344,7 +344,7 @@
{VARIABLE saurians_safe 0}
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "Hey look, that tribe of orcs that destroyed my enclave
in the Silent Forest have reinforced Prestim. It is time to avenge the death of
our fallen kin my friends - get them!"
[/message]
@@ -539,11 +539,11 @@
[event]
name=turn 8
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "This has taken too much time, we should send all of
our troops and send these creatures back to hell."
[/message]
[message]
- speaker=Oumph
+ speaker=Darstang
message= _ "It won't be said that Elves were braver than us,
everyone attack!"
[/message]
[modify_side]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg
Thu Mar 20 23:45:52 2008
@@ -112,8 +112,8 @@
[side]
type=Elvish Champion
- id=Mkel
- name= _ "Mkel"
+ id=Thelarion
+ name= _ "Thelarion"
side=2
canrecruit=yes
[ai]
@@ -137,8 +137,8 @@
[side]
type=Dwarvish Steelclad
- id=Oumph
- name= _ "Oumph"
+ id=Darstang
+ name= _ "Darstang"
side=3
canrecruit=yes
[ai]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
Thu Mar 20 23:45:52 2008
@@ -74,8 +74,8 @@
[side]
type=Dwarvish Steelclad
- id=Oumph
- name= _ "Oumph"
+ id=Darstang
+ name= _ "Darstang"
side=4
canrecruit=yes
recruit=recruit=Dwarvish Fighter, Dwarvish Thunderer, Gryphon Rider,
Dwarvish Steelclad
@@ -171,15 +171,15 @@
[unit]
type=Elvish Champion
- id=Mkel
- name= _ "Mkel"
+ id=Thelarion
+ name= _ "Thelarion"
side=4
x=18
y=2
[/unit]
[message]
- speaker=Oumph
+ speaker=Darstang
message= _ "My my, look at this, two abandoned keeps. Probably
built by those orcs in one of their pointless wars against each-other."
[/message]
@@ -218,27 +218,27 @@
# wmllint: recognize Inarix
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "Blast it, the orcs have caught up to us."
[/message]
[message]
- speaker=Oumph
+ speaker=Darstang
message= _ "Elf, our kind can move and fight far better and faster
in these conditions then your kind can. Take the orcish prisoners and hurry to
Melmog. The dwarves shall stop this orcish menace!"
[/message]
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "Very well, but our human allies will also stay behind
and help you. After all, we are dealing with the Son of the Black-Eye here."
[/message]
[message]
- speaker=Oumph
+ speaker=Darstang
message= _ "Pah, have it your way then. Now, hurry on your way
elf."
[/message]
[kill]
- id=Mkel
+ id=Thelarion
[/kill]
[move_unit_fake]
@@ -248,7 +248,7 @@
[/move_unit_fake]
[message]
- speaker=Oumph
+ speaker=Darstang
message= _ "Pah, cowardly little elves. No dwarf would have ever
agreed to such a proposal. Good riddance too, those elves just get in the way.
Come on men, it's time to show those Orcs our steel!"
[/message]
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg Thu
Mar 20 23:45:52 2008
@@ -101,8 +101,8 @@
[side]
type=Elvish Champion
- id=Mkel
- name= _ "Mkel"
+ id=Thelarion
+ name= _ "Thelarion"
recruit=Elvish Captain, Elvish Fighter, Elvish Archer, Elvish
Marksman, Elvish Druid, Elvish Scout, Elvish Hero, Elvish Ranger
side=6
canrecruit=yes
@@ -522,7 +522,7 @@
name=die
[filter]
- id=Mkel
+ id=Thelarion
[/filter]
[message]
@@ -531,7 +531,7 @@
[/message]
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "Ugh!"
[/message]
@@ -541,7 +541,7 @@
[/message]
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "....well, what do you want to know?"
[/message]
@@ -551,7 +551,7 @@
[/message]
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "Uh.... we have intelligence."
[/message]
@@ -561,7 +561,7 @@
[/message]
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "OK OK, Shan Taum the Smug told us that that's where
the shamans were, and that it was a rally point and weapons depot for you orcs."
[/message]
@@ -571,7 +571,7 @@
[/message]
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "No really, it's true. He is jealous of some young
upstart called Kapou'e. He says all the shamans 'suck up' to him just because
his father had a black eye or something like that."
[/message]
@@ -581,7 +581,7 @@
[/message]
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "They're.... the humans killed them."
[/message]
@@ -591,7 +591,7 @@
[/message]
[message]
- speaker=Mkel
+ speaker=Thelarion
message= _ "I do not. Their bodies are frozen in the lake just
over there."
[/message]
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
---
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg
(original)
+++
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg
Thu Mar 20 23:45:52 2008
@@ -1,25 +1,10 @@
#textdomain wesnoth-units
[unit_type]
+ [base_unit]
+ id=Dwarvish Fighter
+ [/base_unit]
id=Dwarvish Masked Fighter
- # Variant of the Dwarvish Fighter -- same stats, different sprites.
- name= _ "Dwarvish Masked Fighter"
- race=dwarf
- image="units/masked_fighter.png"
- {MAGENTA_IS_THE_TEAM_COLOR}
- ellipse="misc/ellipse"
- hitpoints=38
- movement_type=dwarvishfoot
- movement=4
- experience=41
- level=1
- alignment=neutral
advanceto=Dwarvish Masked Steelclad
- undead_variation=dwarf
- cost=16
- usage=fighter
- # FIXME: Customize this description after string thaw
- unit_description= _ "Dwarvish Fighters wield mighty battle axes and
hammers, which make them feared opponents in close range combat. They are
excellent in mountainous terrain or underground. Though not swift, their power
and endurance more than compensate."
- die_sound={SOUND_LIST:DWARF_DIE}
{DEFENSE_ANIM_FILTERED "units/masked_fighter-axedefend.png"
"units/masked_fighter.png" {SOUND_LIST:DWARF_HIT} (
[secondary_attack_filter]
name=axe
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
--- trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg
(original)
+++ trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg
Thu Mar 20 23:45:52 2008
@@ -16,8 +16,7 @@
undead_variation=dwarf
cost=54
usage=fighter
- # FIXME: Customize this after string freeze
- unit_description= _ "Clad in shining armor, these dwarves look like kings
from under the mountains. They wield axe and hammer with masterful skill, and
can hit a target with a thrown hand axe at several paces. Though slow on their
feet, these dwarves are a testament to the prowess of their kin."
+ unit_description= _ "Feared in dwarven legend is the Dwarf Lord who masks
his face, using the formidable fighting powers of his kind without accounting
to his peers and the loremasters of Dwarven-kind for the dark and bloody uses
to which he puts his weapons. Like his barefaced kin, the Dwarf Lord wields
axe and hammer with masterful skill, and can hit a target with a thrown hand
axe at several paces. Though slow on their feet, these dwarves are a testament
to the prowess of their kind."
die_sound={SOUND_LIST:DWARF_DIE}
{DEFENSE_ANIM "units/masked_lord-defend.png" "units/masked_lord.png"
{SOUND_LIST:DWARF_HIT} }
[resistance]
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
---
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg
(original)
+++
trunk/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg
Thu Mar 20 23:45:52 2008
@@ -16,8 +16,7 @@
undead_variation=dwarf
cost=32
usage=fighter
- # FIXME: Customize after string thaw.
- unit_description= _ "The more experienced Dwarvish fighters wear heavy
chain mail and plate armor, for which they are rightly famous."
+ unit_description= _ "More experienced Dwarvish fighters wear heavy chain
mail and plate armor, for which they are rightly famous. In the dark dreams of
dwarvenkind, some conceal their faces behind riveted masks."
die_sound={SOUND_LIST:DWARF_DIE}
{DEFENSE_ANIM "units/masked_steelclad-defend.png"
"units/masked_steelclad.png" {SOUND_LIST:DWARF_HIT} }
[resistance]
Modified: trunk/data/tools/wesnoth/wmltools.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wesnoth/wmltools.py?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
--- trunk/data/tools/wesnoth/wmltools.py (original)
+++ trunk/data/tools/wesnoth/wmltools.py Thu Mar 20 23:45:52 2008
@@ -158,7 +158,7 @@
atype = "terrain_code"
elif a.endswith(".wav") or a.endswith(".ogg"):
atype = "sound"
- elif a.startswith('"') and a.endswith('"'):
+ elif a.startswith('"') and a.endswith('"') or a.startswith("_"):
atype = "stringliteral"
elif "=" in a:
atype = "filter"
Modified: trunk/src/wesconfig.h
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/wesconfig.h?rev=24917&r1=24916&r2=24917&view=diff
==============================================================================
--- trunk/src/wesconfig.h (original)
+++ trunk/src/wesconfig.h Thu Mar 20 23:45:52 2008
@@ -1,3 +1,4 @@
+
#ifndef WESCONFIG_H_INCLUDED
#define WESCONFIG_H_INCLUDED
@@ -5,14 +6,14 @@
//! Some defines: VERSION, PACKAGE, MIN_SAVEGAME_VERSION
//!
//! DO NOT MODIFY THIS FILE !!!
-//! modify configure.ac otherwise the settings will be overwritten.
+//! modify SConstruct otherwise the settings will be overwritten.
#ifdef HAVE_CONFIG_H
# include "config.h"
#else
-# define VERSION "1.5.0-svn"
+# define VERSION "1.3.14+svn"
# define PACKAGE "wesnoth"
# ifndef LOCALEDIR
# define LOCALEDIR "translations"
@@ -20,7 +21,7 @@
#endif
/**
- * Some older savegames of Wesnoth can't be loaded anymore,
+ * Some older savegames of Wesnoth cannot be loaded anymore,
* this variable defines the minimum required version.
* It is only to be updated upon changes that break *all* saves/replays
* (break as in crash wesnoth, not compatibility issues like stat changes)
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
