Author: soliton
Date: Tue Sep 9 23:08:45 2008
New Revision: 29368
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29368&view=rev
Log:
* Made units with the healthy trait take half the damage from poison.
Modified:
trunk/changelog
trunk/data/core/macros/traits.cfg
trunk/doc/manual/manual.txt
trunk/players_changelog
trunk/src/actions.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=29368&r1=29367&r2=29368&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Tue Sep 9 23:08:45 2008
@@ -17,6 +17,7 @@
* Added a new music track "The Dangerous Symphony" by Gianmarco Leone.
* Units:
* Balancing changes:
+ * Made units with the healthy trait take half the damage from poison.
* Decreased the ranged attack of the Bowman from 7-3 to 6-3.
* Added the marksman special to the ranged attack of the Orcish Assassin
line.
Modified: trunk/data/core/macros/traits.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/traits.cfg?rev=29368&r1=29367&r2=29368&view=diff
==============================================================================
--- trunk/data/core/macros/traits.cfg (original)
+++ trunk/data/core/macros/traits.cfg Tue Sep 9 23:08:45 2008
@@ -126,11 +126,12 @@
#define TRAIT_HEALTHY
# Units with trait Healthy get 1 more HP plus 1 per level and can move and
rest in the same turn.
+ # They also suffer only half the damage from poison.
[trait]
id=healthy
male_name= _ "healthy"
female_name= _ "female^healthy"
- description= _ "Can rest while moving"
+ description= _ "Can rest while moving, halves poison damage"
[effect]
apply_to=hitpoints
increase_total=1
Modified: trunk/doc/manual/manual.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/doc/manual/manual.txt?rev=29368&r1=29367&r2=29368&view=diff
==============================================================================
--- trunk/doc/manual/manual.txt (original)
+++ trunk/doc/manual/manual.txt Tue Sep 9 23:08:45 2008
@@ -607,6 +607,7 @@
rest even when traveling.
Healthy units have 1 HP plus 1 HP per level more than usual and rest heal the
usual 2 HP after each turn they did not fight.
+ They also suffer only half the damage from poison.
Fearless::
Does not suffer from a negative attack bonus during its unfavorable
time of day (Trolls, Walking Corpses).
Modified: trunk/players_changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/players_changelog?rev=29368&r1=29367&r2=29368&view=diff
==============================================================================
--- trunk/players_changelog (original)
+++ trunk/players_changelog Tue Sep 9 23:08:45 2008
@@ -23,6 +23,7 @@
* Added a new music track "The Dangerous Symphony" by Gianmarco Leone.
* Unit changes and balancing
+ * Made units with the healthy trait take half the damage from poison.
* Decreased the ranged attack of the Bowman from 7-3 to 6-3.
* Added the marksman special to the ranged attack of the Orcish Assassin
line.
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=29368&r1=29367&r2=29368&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Tue Sep 9 23:08:45 2008
@@ -1768,7 +1768,7 @@
healers.clear();
healing = rest_healing;
if(i->second.side() == side) {
- healing -= game_config::poison_amount;
+ healing -= i->second.is_healthy() ?
game_config::poison_amount / 2 : game_config::poison_amount;
}
}
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
