Author: espreon
Date: Fri May 27 23:13:46 2011
New Revision: 49666
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49666&view=rev
Log:
Completed the removal of Liminal.
Modified:
trunk/changelog
trunk/data/english.cfg
trunk/data/hardwired/tips.cfg
trunk/src/menu_events.cpp
trunk/src/unit_types.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=49666&r1=49665&r2=49666&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Fri May 27 23:13:46 2011
@@ -40,6 +40,7 @@
* 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:
Modified: trunk/data/english.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/english.cfg?rev=49666&r1=49665&r2=49666&view=diff
==============================================================================
--- trunk/data/english.cfg (original)
+++ trunk/data/english.cfg Fri May 27 23:13:46 2011
@@ -4,10 +4,6 @@
NORMAL= _ "Medium"
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.
Modified: trunk/data/hardwired/tips.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/hardwired/tips.cfg?rev=49666&r1=49665&r2=49666&view=diff
==============================================================================
--- trunk/data/hardwired/tips.cfg (original)
+++ trunk/data/hardwired/tips.cfg Fri May 27 23:13:46 2011
@@ -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]
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=49666&r1=49665&r2=49666&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Fri May 27 23:13:46 2011
@@ -3488,11 +3488,11 @@
// 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" ){
Modified: trunk/src/unit_types.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.cpp?rev=49666&r1=49665&r2=49666&view=diff
==============================================================================
--- trunk/src/unit_types.cpp (original)
+++ trunk/src/unit_types.cpp Fri May 27 23:13:46 2011
@@ -963,8 +963,8 @@
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_id(unit_type::ALIGNMENT align)
{
- static const char* aligns[] = { "lawful", "neutral", "chaotic",
"liminal" };
+ static const char* aligns[] = { "lawful", "neutral", "chaotic" };
return (aligns[align]);
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
