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

revert 2007-10-04T14:51:04Z!esr@thyrsus.com

Browse source 
improve the trait tooltips
This commit is contained in:
Gunter Labes 2007-10-04 17:09:56 +00:00
parent 65e6a8fc1d
commit 5c449df942
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/core/macros/traits.cfg
View file

@ -51,7 +51,6 @@
id=strong
male_name= _ "strong"
female_name= _ "female^strong"
description="Has +1 to all attacks"
[effect]
apply_to=attack
range=melee
@ -84,7 +83,6 @@
id=quick
male_name= _ "quick"
female_name= _ "female^quick"
description="Has +1 movement"
[effect]
apply_to=movement
increase=1
@ -102,7 +100,6 @@
id=intelligent
male_name= _ "intelligent"
female_name= _ "female^intelligent"
description = "Requires 20% less XP to advance"
[effect]
apply_to=max_experience
increase=-20%
@ -116,7 +113,6 @@
id=resilient
male_name= _ "resilient"
female_name= _ "female^resilient"
description="Has 4 extra HP + 1 per level"
[effect]
apply_to=hitpoints
increase_total=4
@ -155,7 +151,7 @@
#define TRAIT_FEARLESS_MUSTHAVE
# A clone of the above that would be generated even if random
# trait generation is not used. this is needed for WCs and
# trait generation is not used. This is needed for WCs and
# Soullesses
[trait]
id=fearless

21
src/unit.cpp
View file

@ -2570,11 +2570,11 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
first_attack = false;
} else {
if (!times)
description += t_string(N_("; "), "wesnoth");
description += t_string(N_(" and "), "wesnoth");
}
if (!times)
description += t_string(a->name(), "wesnoth") + " " + desc;
description += t_string(a->name(), "wesnoth") + ": " + desc;
}
}
} else if(apply_to == "hitpoints") {
@ -2640,7 +2640,7 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
if (!times)
description += (increase[0] != '-' ? "+" : "") +
increase + " " +
t_string(N_("Moves"), "wesnoth");
t_string(N_("moves"), "wesnoth");
max_movement_ = utils::apply_modifier(max_movement_, increase, 1);
}
@ -2893,10 +2893,10 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
if(first_attack) {
first_attack = false;
} else {
description += t_string(N_("; "), "wesnoth");
description += t_string(N_(" and "), "wesnoth");
}
description += t_string(a->name(), "wesnoth") + " " + desc;
description += t_string(a->name(), "wesnoth") + ": " + desc;
}
}
} else if(apply_to == "hitpoints") {
@ -2912,8 +2912,7 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
if(increase.empty() == false) {
description += (increase[0] != '-' ? "+" : "") +
increase + " " +
t_string(N_("Moves"), "wesnoth");
increase + t_string(N_(" move"), "wesnoth");
}
} else if(apply_to == "max_experience") {
const std::string& increase = (**i.first)["increase"];
@ -2927,7 +2926,7 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
}
if (apply_times == "per level" && !times)
description += t_string(N_("/level"), "wesnoth");
description += t_string(N_(" per level"), "wesnoth");
if(!description.empty())
effects_description.push_back(description);
@ -2943,14 +2942,14 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
}
if(effects_description.empty() == false) {
description += t_string(N_("("), "wesnoth");
//description += t_string(N_("("), "wesnoth");
for(std::vector<t_string>::const_iterator i = effects_description.begin();
i != effects_description.end(); ++i) {
description += *i;
if(i+1 != effects_description.end())
description += t_string(N_("; "), "wesnoth");
description += t_string(N_(" and "), "wesnoth");
}
description += t_string(N_(")"), "wesnoth");
//description += t_string(N_(")"), "wesnoth");
}
description += "\n";