From 77e647420ae5a395bacbdc53cbec1170d4a474b0 Mon Sep 17 00:00:00 2001
From: Gunter Labes <soliton@wesnoth.org>
Date: Tue, 16 Sep 2008 12:24:28 +0000
Subject: [PATCH] Made units with the healthy trait...

...take a quarter less damage from poison instead of half.
---
 changelog         | 4 ++++
 players_changelog | 4 +++-
 src/actions.cpp   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 1ab9e73148e..36a5027b3a8 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,10 @@ Version 1.5.4+svn:
    * Made it possible to translate ability names according to the
      unit/unit_type's gender (feature #11982).
    * updated translations: Finnish, Slovak
+ * Units:
+   * Balancing changes:
+     * Made units with the healthy trait take a quarter less damage from
+       poison instead of half.
  * User interface:
    * Various minor cleanups and refactoring of the new widgets.
    * Fixed a problem under Window where the locales detection didn't work
diff --git a/players_changelog b/players_changelog
index 9b2650e6407..dd775575a35 100644
--- a/players_changelog
+++ b/players_changelog
@@ -5,6 +5,8 @@ changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
 Version 1.5.4+svn:
   * Language and translations
     * updated translations: Finnish, Slovak.
+  * Unit changes and balancing
+    * Made units with the healthy trait take a quarter less damage from poison.
 
 Version 1.5.4:
   * Editor2
@@ -15,7 +17,7 @@ Version 1.5.4:
       Use the new "partial undo" feature (default hotkey ctrl+z, cmd+z 
       on Mac) to get the old behaviour, when you want to only undo a part 
       of a paint-drag or select-drag. After the actions are split this way
-	  they are never combined again.
+      they are never combined again.
     * More visible selection.
     * Different map generators can be used in map -> generate map (FR #3950)
 
diff --git a/src/actions.cpp b/src/actions.cpp
index 670bb88f726..ab1414481aa 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1768,7 +1768,7 @@ void calculate_healing(game_display& disp, const gamemap& map,
 				healers.clear();
 				healing = rest_healing;
 				if(i->second.side() == side) {
-					healing -= i->second.is_healthy() ? game_config::poison_amount / 2 : game_config::poison_amount;
+					healing -= i->second.is_healthy() ? game_config::poison_amount * 3/4 : game_config::poison_amount;
 				}
 			}
 		}