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

Make it a default to remove poison from immune units.

Browse source 
This impacts wesnoth.transform_unit, [effect]apply_to=type, and
[effect]apply_to=variation.  If desired, the poisoned state can still
be explicitly set for immune units; this change only affects default
behavior, making it correspond better to the core rules.
This commit is contained in:
J. Tyne 2013-01-05 17:46:59 +00:00
parent c4f81f2ebf
commit 01c20ecea5
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -30,6 +30,8 @@ Version 1.11.1+svn:
* new helper.shuffle() function
* The wesnoth.transform_unit() function no longer performs a full heal. It
will (still) enforce the resulting unit's maximum hit points, though.
* The wesnoth.transform_unit() function will automatically remove poison from
a unit that is immune after transforming.
* Multiplayer:
* Moved new lobby option in Preferences -> Multiplayer to Advanced
Preferences and clarified description
@ -47,6 +49,8 @@ Version 1.11.1+svn:
* The bugs with sighted events have been resolved.
* A unit's maximum hit points are more regularly applied. This affects
[transform_unit], [effect]apply_to=type, and [effect]apply_to=variation.
* Poison is automatically removed from immune units after using
[effect]apply_to=type or [effect]apply_to=variation.
* Miscellaneous and bug fixes:
* The undo stack is preserved across a save-reload.
* Removed several unused private member variables.

3
data/lua/wml-tags.lua
View file

@ -932,9 +932,8 @@ function wml_actions.transform_unit(cfg)
unit.experience = experience
for key, value in pairs(status) do unit.status[key] = value end
if unit.status.not_living then unit.status.poisoned = nil end
end
if unit.status.not_living then unit.status.poisoned = nil end
end
wml_actions.redraw {}

13
src/unit.cpp
View file

@ -936,6 +936,11 @@ void unit::advance_to(const config &old_cfg, const unit_type *t,
// that may result in different effects after the advancement.
apply_modifications();
// Now that modifications are done modifying traits, check if poison should
// be cleared.
if ( get_state("unpoisonable") )
set_state(STATE_POISONED, false);
// Now that modifications are done modifying the maximum hit points,
// enforce this maximum.
if ( hit_points_ > max_hit_points_ )
@ -2492,6 +2497,7 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
if(no_add == false) {
new_child = &modifications_.add_child(type,mod);
}
bool set_poisoned = false; // Tracks if the poisoned state was set after the type or variation was changed.
config last_effect;
std::vector<t_string> effects_description;
BOOST_FOREACH(const config &effect, mod.child_range("effect"))
@ -2513,6 +2519,7 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
// Apply unit type/variation changes last to avoid double applying effects on advance.
if ((apply_to == "variation" || apply_to == "type") && no_add == false) {
set_poisoned = false;
last_effect = effect;
} else if(apply_to == "profile") {
if (const config::attribute_value *v = effect.get("portrait")) {
@ -2664,10 +2671,12 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
if(add.empty() == false) {
set_state(add, true);
set_poisoned = set_poisoned || add == "poisoned";
}
if(remove.empty() == false) {
set_state(remove, false);
set_poisoned = set_poisoned && remove != "poisoned";
}
} else if (apply_to == "movement_costs") {
config &mv = cfg_.child_or_add("movement_costs");
@ -2868,6 +2877,10 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
WRN_UT << "unknown type= in [effect]apply_to=type, ignoring\n";
}
}
if ( set_poisoned )
// An effect explictly set the poisoned state, and this
// should override the unit being immune to poison.
set_state(STATE_POISONED, true);
}
t_string description;