upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-15 09:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Completed the removal of Liminal.

Browse Source
This commit is contained in:
Steven Panek 2011-05-27 21:13:46 +00:00
parent e714634880
commit 053d5e374e
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -40,6 +40,7 @@ Version 1.9.6+svn:
* support for leader specific recall filters
* [unit] [recall_filter] <SUF>
-- The unit can only recruit units which pass the SUF
* Removed the Liminal alignment
Version 1.9.6:
* Campaigns:

4
data/english.cfg
View File

@ -5,10 +5,6 @@
HARD= _ "Hard"
NIGHTMARE= _ "Nightmare"
liminal_description= _ "Liminal units fight better during twilight while fighting normally during day and night.
Twilight: +25% Damage"
lawful_description= _ "Lawful units fight better during the day, and worse at night.
Day: +25% Damage

2
data/hardwired/tips.cfg
View File

@ -41,7 +41,7 @@
source= _ "<i>― The Wesnoth Community</i>"
[/tip]
[tip]
text= _ "<i>Lawful</i> units fight better by day, and <i>chaotic</i> units fight better at night. <i>Neutral</i> units are unaffected by the time of day. The rare <i>Liminal</i> unit type fights best during the twilight hours."
text= _ "<i>Lawful</i> units fight better by day, and <i>chaotic</i> units fight better at night. <i>Neutral</i> units are unaffected by the time of day."
source= _ "<i>― Royal Compendium of Battle Terminology: Volume II (reprinted 221YW)</i>"
[/tip]
[tip]

4
src/menu_events.cpp
View File

@ -3488,11 +3488,11 @@ void console_handler::do_unit() {
// But someday the code ought to be
// changed to allow general string
// alignments for UMC.
if (name == "alignment" && (value != "lawful" && value != "neutral" && value != "chaotic" && value != "liminal")) {
if (name == "alignment" && (value != "lawful" && value != "neutral" && value != "chaotic")) {
utils::string_map symbols;
symbols["alignment"] = get_arg(1);
command_failed(VGETTEXT("Invalid alignment: '$alignment',"
" needs to be one of lawful, neutral, chaotic or liminal.", symbols));
" needs to be one of lawful, neutral, or chaotic.", symbols));
return;
}
if (name == "advances" ){

6
src/unit_types.cpp
View File

@ -963,8 +963,8 @@ int unit_type::experience_needed(bool with_acceleration) const
const char* unit_type::alignment_description(unit_type::ALIGNMENT align, unit_race::GENDER gender)
{
static const char* aligns[] = { N_("lawful"), N_("neutral"), N_("chaotic"), N_("liminal") };
static const char* aligns_female[] = { N_("female^lawful"), N_("female^neutral"), N_("female^chaotic"), N_("female^liminal") };
static const char* aligns[] = { N_("lawful"), N_("neutral"), N_("chaotic") };
static const char* aligns_female[] = { N_("female^lawful"), N_("female^neutral"), N_("female^chaotic") };
const char** tlist = (gender == unit_race::MALE ? aligns : aligns_female);
return (sgettext(tlist[align]));
@ -972,7 +972,7 @@ const char* unit_type::alignment_description(unit_type::ALIGNMENT align, unit_ra
const char* unit_type::alignment_id(unit_type::ALIGNMENT align)
{
static const char* aligns[] = { "lawful", "neutral", "chaotic", "liminal" };
static const char* aligns[] = { "lawful", "neutral", "chaotic" };
return (aligns[align]);
}