From c132fb792f36026bf2e65d02176da2090de3928a Mon Sep 17 00:00:00 2001 From: nothere Date: Sat, 14 Aug 2004 23:10:00 +0000 Subject: [PATCH] =?utf8?q?=E7=B0=A1=E6=98=93=E8=87=AA=E5=8B=95=E7=A0=B4?= =?utf8?q?=E5=A3=8A=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3leave=5Fsp?= =?utf8?q?ecial=E3=81=A7,=20=E5=BF=8D=E8=80=85=E3=81=AE=E5=A0=B4=E5=90=88?= =?utf8?q?=E3=81=AE=E6=9A=97=E9=97=87=E5=85=89=E6=BA=90=E3=81=8C=E6=9C=AA?= =?utf8?q?=E9=91=91=E5=AE=9A=E3=81=A7=20=E3=82=82=E8=87=AA=E5=8B=95?= =?utf8?q?=E7=A0=B4=E5=A3=8A=E5=AF=BE=E8=B1=A1=E5=A4=96=E3=81=AB=E3=81=AA?= =?utf8?q?=E3=81=A3=E3=81=9F=E3=82=8A,=20=E9=AD=94=E7=8D=A3=E4=BD=BF?= =?utf8?q?=E3=81=84/=E9=A8=8E=E5=85=B5=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=AE?= =?utf8?q?=E5=9B=9E=E5=BE=A9=E3=83=A2=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=BC?= =?utf8?q?=E3=81=AE=E9=AD=94=E6=B3=95=20=E6=A3=92=E3=81=8C=E6=9C=AA?= =?utf8?q?=E5=88=A4=E6=98=8E=E3=81=A7=E3=82=82=E8=87=AA=E5=8B=95=E7=A0=B4?= =?utf8?q?=E5=A3=8A=E5=AF=BE=E8=B1=A1=E5=A4=96=E3=81=AB=E3=81=AA=E3=82=8B?= =?utf8?q?=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/autopick.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index 4676fc721..a6f2e0a2e 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -1494,21 +1494,21 @@ static bool is_opt_confirm_destroy(object_type *o_ptr) /* Known to be worthless? */ if (leave_worth) if (object_value(o_ptr) > 0) return FALSE; - + if (leave_equip) if (object_is_weapon_armour_ammo(o_ptr)) return FALSE; - + if (leave_chest) if ((o_ptr->tval == TV_CHEST) && o_ptr->pval) return FALSE; - + if (leave_wanted) { if (object_is_shoukinkubi(o_ptr)) return FALSE; } - + if (leave_corpse) if (o_ptr->tval == TV_CORPSE) return FALSE; - + if (leave_junk) if ((o_ptr->tval == TV_SKELETON) || (o_ptr->tval == TV_BOTTLE) || (o_ptr->tval == TV_JUNK) || (o_ptr->tval == TV_STATUE)) return FALSE; @@ -1531,20 +1531,20 @@ static bool is_opt_confirm_destroy(object_type *o_ptr) else if (p_ptr->pclass == CLASS_NINJA) { if (o_ptr->tval == TV_LITE && - o_ptr->name2 == EGO_LITE_DARKNESS) + o_ptr->name2 == EGO_LITE_DARKNESS && object_is_known(o_ptr)) return FALSE; } else if (p_ptr->pclass == CLASS_BEASTMASTER || p_ptr->pclass == CLASS_CAVALRY) { if (o_ptr->tval == TV_WAND && - o_ptr->sval == SV_WAND_HEAL_MONSTER) + o_ptr->sval == SV_WAND_HEAL_MONSTER && object_is_aware(o_ptr)) return FALSE; } } - + if (o_ptr->tval == TV_GOLD) return FALSE; - + return TRUE; } -- 2.11.0