From 6d06542c9826273ba002ed6031025b7c41cc0c0f Mon Sep 17 00:00:00 2001
From: cjo <cjo@ulyco.com>
Date: Fri, 2 Aug 2013 12:04:25 -0700
Subject: [PATCH] Allow use-id of rPoison when hit by needles

This patch allows rings of resist poison to be identified when
the player is hit by curare or poisoned needles.
---
 crawl-ref/source/player.cc | 3 +++
 crawl-ref/source/throw.cc  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 3675801..23d2785 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5105,6 +5105,9 @@ bool poison_player(int amount, string source, string source_aux, bool force)
 {
     ASSERT(!crawl_state.game_is_arena());
 
+    if (player_res_poison() > 0)
+        maybe_id_resist(BEAM_POISON);
+
     if (player_res_poison() >= 3)
     {
         dprf("Cannot poison, you are immune!");
diff --git a/crawl-ref/source/throw.cc b/crawl-ref/source/throw.cc
index e1cbacf..853cad2 100644
--- a/crawl-ref/source/throw.cc
+++ b/crawl-ref/source/throw.cc
@@ -584,6 +584,12 @@ static bool _elemental_missile_beam(int launcher_brand, int ammo_brand)
 
 static bool _poison_hit_victim(bolt& beam, actor* victim, int dmg)
 {
+    if (victim->is_player() && victim->res_poison() > 0)
+    {
+        maybe_id_resist(BEAM_POISON);
+        return false;
+    }
+
     if (!victim->alive() || victim->res_poison() > 0)
         return false;
 
-- 
1.8.3-rc3