Author: fendrin
Date: Fri May 27 18:44:43 2011
New Revision: 49662
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49662&view=rev
Log:
Removed the liminal alignment support from the engine. Changelog and Wiki need
attention.
Modified:
trunk/data/core/help.cfg
trunk/src/actions.cpp
trunk/src/reports.cpp
trunk/src/terrain_filter.cpp
trunk/src/time_of_day.cpp
trunk/src/time_of_day.hpp
trunk/src/tod_manager.cpp
trunk/src/unit.cpp
trunk/src/unit_types.cpp
trunk/src/unit_types.hpp
Modified: trunk/data/core/help.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/help.cfg?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/data/core/help.cfg (original)
+++ trunk/data/core/help.cfg Fri May 27 18:44:43 2011
@@ -265,7 +265,6 @@
text= _"The time of day affects the damage of certain units as follows:
Lawful units get +25% damage in daytime, and â25% damage at night.
Chaotic units get +25% damage at night, and â25% in daytime.
- Liminal units get +25% damage during twilight.
Neutral units are unaffected by the time of day." + _"
The current time of day can be observed under the minimap in the status pane.
For the usual day/night cycle, morning and afternoon count as day, first and
second watch count as night:
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Fri May 27 18:44:43 2011
@@ -2162,7 +2162,6 @@
int bonus;
int lawful_bonus = tod.lawful_bonus;
- int liminal_bonus = tod.liminal_bonus;
switch(alignment) {
case unit_type::LAWFUL:
@@ -2173,9 +2172,6 @@
break;
case unit_type::CHAOTIC:
bonus = -lawful_bonus;
- break;
- case unit_type::LIMINAL:
- bonus = liminal_bonus;
break;
default:
bonus = 0;
Modified: trunk/src/reports.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/reports.cpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/reports.cpp (original)
+++ trunk/src/reports.cpp Fri May 27 18:44:43 2011
@@ -594,17 +594,15 @@
}
int b = tod.lawful_bonus;
- int c = tod.liminal_bonus;
+
tooltip << tod.name << '\n'
<< _("Lawful units: ") << utils::signed_percent(b) << '\n'
<< _("Neutral units: ") << utils::signed_percent(0) << '\n'
- << _("Chaotic units: ") << utils::signed_percent(-b);
- if (tod.liminal_present)
- tooltip << '\n' << _("Liminal units: ") <<
utils::signed_percent(c);
+ << _("Chaotic units: ") << utils::signed_percent(-b) << '\n';
std::string tod_image = tod.image;
- if (tod.lawful_bonus_modified > 0) tod_image += "~BRIGHTEN()";
- else if (tod.lawful_bonus_modified < 0) tod_image += "~DARKEN()";
+ if (tod.bonus_modified > 0) tod_image += "~BRIGHTEN()";
+ else if (tod.bonus_modified < 0) tod_image += "~DARKEN()";
if (preferences::flip_time()) tod_image += "~FL(horiz)";
return image_report(tod_image, tooltip.str(), "time_of_day");
Modified: trunk/src/terrain_filter.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/terrain_filter.cpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/terrain_filter.cpp (original)
+++ trunk/src/terrain_filter.cpp Fri May 27 18:44:43 2011
@@ -227,10 +227,6 @@
if(std::find(vals.begin(),vals.end(),std::string("lawful")) == vals.end()) {
return false;
}
- } else if(tod.liminal_bonus>0) {
-
if(std::find(vals.begin(),vals.end(),std::string("liminal")) == vals.end()) {
- return false;
- }
} else
if(std::find(vals.begin(),vals.end(),std::string("neutral")) == vals.end()) {
return false;
}
Modified: trunk/src/time_of_day.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/time_of_day.cpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/time_of_day.cpp (original)
+++ trunk/src/time_of_day.cpp Fri May 27 18:44:43 2011
@@ -23,10 +23,7 @@
time_of_day::time_of_day(const config& cfg):
lawful_bonus(cfg["lawful_bonus"]),
- lawful_bonus_modified(0),
- liminal_bonus(cfg["liminal_bonus"]),
- liminal_bonus_modified(0),
- liminal_present(!(cfg["liminal_bonus"]).empty()),
+ bonus_modified(0),
image(cfg["image"]), name(cfg["name"].t_str()), id(cfg["id"]),
image_mask(cfg["mask"]),
red(cfg["red"]), green(cfg["green"]), blue(cfg["blue"]),
@@ -36,10 +33,7 @@
time_of_day::time_of_day()
: lawful_bonus(0)
-, lawful_bonus_modified(0)
-, liminal_bonus(0)
-, liminal_bonus_modified(0)
-, liminal_present(false)
+, bonus_modified(0)
, image()
, name("NULL_TOD")
, id("nulltod")
@@ -54,7 +48,6 @@
void time_of_day::write(config& cfg) const
{
cfg["lawful_bonus"] = lawful_bonus;
- cfg["liminal_bonus"] = liminal_bonus;
cfg["red"] = red;
cfg["green"] = green;
cfg["blue"] = blue;
Modified: trunk/src/time_of_day.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/time_of_day.hpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/time_of_day.hpp (original)
+++ trunk/src/time_of_day.hpp Fri May 27 18:44:43 2011
@@ -45,12 +45,7 @@
/** The % bonus lawful units receive. Chaotics receive -lawful_bonus. */
int lawful_bonus;
- int lawful_bonus_modified;
-
- /** The % bonus liminal units receive. */
- int liminal_bonus;
- int liminal_bonus_modified;
- bool liminal_present;
+ int bonus_modified;
/** The image to be displayed in the game status. */
std::string image;
Modified: trunk/src/tod_manager.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tod_manager.cpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/tod_manager.cpp (original)
+++ trunk/src/tod_manager.cpp Fri May 27 18:44:43 2011
@@ -266,7 +266,7 @@
}
}
- tod.lawful_bonus_modified = illum_light - tod.lawful_bonus;
+ tod.bonus_modified = illum_light - tod.lawful_bonus;
tod.lawful_bonus = illum_light;
return tod;
Modified: trunk/src/unit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.cpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/unit.cpp (original)
+++ trunk/src/unit.cpp Fri May 27 18:44:43 2011
@@ -467,8 +467,6 @@
alignment_ = unit_type::NEUTRAL;
} else if(align == "chaotic") {
alignment_ = unit_type::CHAOTIC;
- } else if(align == "liminal") {
- alignment_ = unit_type::LIMINAL;
} else if(align.empty()==false){
alignment_ = unit_type::NEUTRAL;
}
@@ -1660,9 +1658,6 @@
case unit_type::CHAOTIC:
cfg["alignment"] = "chaotic";
break;
- case unit_type::LIMINAL:
- cfg["alignment"] = "liminal";
- break;
default:
cfg["alignment"] = "neutral";
}
Modified: trunk/src/unit_types.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.cpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/unit_types.cpp (original)
+++ trunk/src/unit_types.cpp Fri May 27 18:44:43 2011
@@ -691,8 +691,6 @@
alignment_ = CHAOTIC;
else if(align == "neutral")
alignment_ = NEUTRAL;
- else if(align == "liminal")
- alignment_ = LIMINAL;
else {
ERR_CF << "Invalid alignment found for " << id() << ": '" <<
align << "'\n";
alignment_ = NEUTRAL;
Modified: trunk/src/unit_types.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.hpp?rev=49662&r1=49661&r2=49662&view=diff
==============================================================================
--- trunk/src/unit_types.hpp (original)
+++ trunk/src/unit_types.hpp Fri May 27 18:44:43 2011
@@ -248,7 +248,7 @@
int old_value_;
};
- enum ALIGNMENT { LAWFUL, NEUTRAL, CHAOTIC, LIMINAL };
+ enum ALIGNMENT { LAWFUL, NEUTRAL, CHAOTIC };
ALIGNMENT alignment() const { return alignment_; }
static const char* alignment_description(ALIGNMENT align,
unit_race::GENDER gender = unit_race::MALE);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
