0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the "description" attribute in [object] to "user_description"...

Browse source 
...to mark the fact that it is used in the game display rather than as a
filter term. For backward compatibility with 1.4 UMC, continue to accept 
"description", but this patch makes the appropriate change in all
mainline content.
This commit is contained in:
Eric S. Raymond 2008-03-11 02:45:12 +00:00
parent 46378083a0
commit 31a3f81875
16 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg
View file

@ -211,7 +211,7 @@
name= _ "Holy Amulet"
image=items/ankh-necklace.png
duration=forever
description= _ "Wearing this amulet will cause every blow you deal to inflict arcane damage!"
user_description= _ "Wearing this amulet will cause every blow you deal to inflict arcane damage!"
cannot_use_message= _ "I am not suited to using this item! Let another take it."
[then]
[removeitem]

2
data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
View file

@ -423,7 +423,7 @@
name= _ "Holy Amulet"
image=items/ankh-necklace.png
duration=forever
description= _ "Wearing this amulet will cause every blow you deal to inflict arcane damage!"
user_description= _ "Wearing this amulet will cause every blow you deal to inflict arcane damage!"
cannot_use_message= _ "I am not suited to using this item! Let another take it."
[then]
[removeitem]

2
data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg
View file

@ -311,7 +311,7 @@
name= _ "Holy Amulet"
image=items/ankh-necklace.png
duration=forever
description= _ "Wearing this amulet will cause every blow you deal to inflict arcane damage!"
user_description= _ "Wearing this amulet will cause every blow you deal to inflict arcane damage!"
cannot_use_message= _ "I am not suited to using this item! Let another take it."
[then]
[removeitem]

2
data/campaigns/Eastern_Invasion/scenarios/12.Captured.cfg
View file

@ -410,7 +410,7 @@
name= _ "Holy Amulet"
image=items/ankh-necklace.png
duration=forever
description= _ "Wearing this amulet will cause every blow you deal to inflict arcane damage!"
user_description= _ "Wearing this amulet will cause every blow you deal to inflict arcane damage!"
cannot_use_message= _ "I am not suited to using this item! Let another take it."
[then]
[removeitem]

2
data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
View file

@ -577,7 +577,7 @@
name=Amulet of Strength
image=attacks/staff-elven.png
duration=forever
description= _ "Showing signs of ancient elvish manufacture, this amulet grants whomever is wearing it increased strength, stamina and protection against fire and holy attacks."
user_description= _ "Showing signs of ancient elvish manufacture, this amulet grants whomever is wearing it increased strength, stamina and protection against fire and holy attacks."
[effect]
apply_to=attack

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
View file

@ -171,7 +171,7 @@
#define RATHELN_ENCOUNTER
[if]
[have_unit]
#wmllint: recognize Ratheln.
#wmllint: recognize Ratheln
description=Ratheln
[/have_unit]
[else]

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
View file

@ -211,7 +211,7 @@
# wmllint: recognize Southbay Guard 1
[object]
description= _ "The Ruby of Fire was imbued with magic in the distant west, and can be used to scorch enemies into submission."
user_description= _ "The Ruby of Fire was imbued with magic in the distant west, and can be used to scorch enemies into submission."
silent=yes
duration=forever
[filter]

4
data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
View file

@ -654,7 +654,7 @@
id=Travelring
name= _ "Traveler's Ring"
image=items/ring-white.png
description= _ "At the end of each turn, this unit takes no damage from the desert."
user_description= _ "At the end of each turn, this unit takes no damage from the desert."
[filter]
x={X}
y={Y}
@ -1866,7 +1866,7 @@
id=PureWater
name= _ "Pure Water"
image=items/holy-water.png
description= _ "This water will make your melee weapons arcane, and thus especially powerful against the undead."
user_description= _ "This water will make your melee weapons arcane, and thus especially powerful against the undead."
[effect]
apply_to=attack

4
data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg
View file

@ -1130,7 +1130,7 @@
id=SpeedyRing
name= _ "Ring of Speed"
image=items/ring-gold.png
description= _ "This ring will increase your maximum speed by 1."
user_description= _ "This ring will increase your maximum speed by 1."
[filter]
x=$ring_x
y=$ring_y
@ -1348,7 +1348,7 @@
id=ColdBlade
name= _ "Cold Blade"
description= _ "The unit who wields this blade will deal cold damage with its melee attack."
user_description= _ "The unit who wields this blade will deal cold damage with its melee attack."
[effect]
apply_to=attack

2
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View file

@ -2419,7 +2419,7 @@
id=Troll Wand
name= _ "Emerald Wand of Poison"
description= _ "This wand make this unit's melee attacks deal poison damage."
user_description= _ "This wand make this unit's melee attacks deal poison damage."
[effect]
apply_to=attack

2
data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
View file

@ -2312,7 +2312,7 @@
id=DwarvenBelt
name= _ "Dwarven Belt"
description= _ "The maximum hit points of the unit who wears this belt will increase by 12."
user_description= _ "The maximum hit points of the unit who wears this belt will increase by 12."
[effect]
apply_to=hitpoints

2
data/campaigns/Under_the_Burning_Suns/scenarios/07a_Dealing_with_Dwarves.cfg
View file

@ -785,7 +785,7 @@
id=FlamingSword
image=flame-sword.png
name= _ "Flaming Sword"
description= _ "This sword will make all your melee attacks do fire damage."
user_description= _ "This sword will make all your melee attacks do fire damage."
[effect]
apply_to=attack

2
data/campaigns/Under_the_Burning_Suns/scenarios/07b_Talking_with_Trolls.cfg
View file

@ -784,7 +784,7 @@
id=FlamingSword
image=items/flame-sword.png
name= _ "Flaming Sword"
description= _ "This sword will make all your melee attacks do fire damage."
user_description= _ "This sword will make all your melee attacks do fire damage."
[effect]
apply_to=attack

2
data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
View file

@ -2363,7 +2363,7 @@
[/filter]
silent=yes
description=_"The user feels much better."
user_description=_"The user feels much better."
duration="level"
[effect]

6
data/tools/wmllint
View file

@ -784,9 +784,9 @@ def sanity_check(filename, lines):
in_trait = True
elif "[/trait]" in lines[i]:
in_trait = False
elif "[kill]" in lines[i] or "[object]" in lines[i] or "[move_unit_fake]" in lines[i] or "[scroll_to_unit]" in lines[i]:
elif "[kill]" in lines[i] or "[effect]" in lines[i] or "[move_unit_fake]" in lines[i] or "[scroll_to_unit]" in lines[i]:
ignoreable = True
elif "[/kill]" in lines[i] or "[/object]" in lines[i] or "[/move_unit_fake]" in lines[i] or "[/scroll_to_unit]" in lines[i]:
elif "[/kill]" in lines[i] or "[/effect]" in lines[i] or "[/move_unit_fake]" in lines[i] or "[/scroll_to_unit]" in lines[i]:
ignoreable = False
elif "[side]" in lines[i] or "[unit]" in lines[i] or "[recall]" in lines[i]:
in_person = True
@ -821,7 +821,7 @@ def sanity_check(filename, lines):
pass
elif key == 'name': # FIXME: check this someday
pass
elif key in ("message", "user_description", "story", "note", "text", "summary", "caption", "label", "unit_description") and not value.startswith("$"):
elif key in ("message", "user_description", "story", "note", "text", "summary", "caption", "label", "unit_description", "cannot_use_message", "set_description") and not value.startswith("$"):
if not has_tr_mark:
print '"%s", line %d: %s needs translation mark' \
% (filename, i+1, key)

5
src/game_events.cpp
View file

@ -1620,7 +1620,10 @@ void event_handler::handle_event_command(const queued_event& event_info,
std::string command_type = "then";
if(u != units->end() && (filter.null() || game_events::unit_matches_filter(u, filter))) {
text = cfg["description"];
text = cfg["user_description"]; // 1.5
// FIXME: remove this after 1.6
if (text.empty())
text = cfg["description"];
u->second.add_modification("object", cfg.get_parsed_config());