|
Dungeon Crawl Stone Soup Tracker - DCSS
|
|
Viewing Issue Advanced Details |
|
|
ID:
|
Category:
|
Severity:
|
Reproducibility:
|
Date Submitted:
|
Last Update:
|
|
8771 |
Bug Report |
minor |
always |
2014-07-08 22:50 |
2014-09-19 02:58 |
|
|
Reporter:
|
minmay |
Local or Remote:
|
Both |
|
|
Assigned To:
|
neil |
Operating System:
|
All |
|
|
Priority:
|
normal |
Console or Tiles:
|
Both |
|
|
Status:
|
closed |
Product Branch:
|
0.15 ancient branch |
|
|
Product Version:
|
0.15-a0-1949-g3bc2141 |
Resolution:
|
done |
|
|
Projection:
|
none |
|
|
|
|
ETA:
|
none |
Fixed in Branch:
|
0.15 ancient branch |
|
|
|
Summary:
|
0008771: Magical staff melee always does 0 damage |
|
Description:
|
Attacking with a staff will always do 0 damage. The bonus damage can trigger, but the attack itself will always be 0 damage (this is particularly obvious if you try meleeing with, say, a staff of wizardry). |
|
Steps To Reproduce:
|
|
|
Additional Information:
|
|
|
System Description:
|
|
| Relationships | | has duplicate | 0008531 | resolved | wheals | Magical staff with shield does zero damage in fsim |
|
|
Attached Files:
|
 0001-Fix-magical-staves-always-doing-0-damage-8771.patch [^] (1,406 bytes) 2014-07-09 21:00 [Show Content] [Hide Content]From 5c4bfd1a8b947be909304bc0dc2c1071e6812500 Mon Sep 17 00:00:00 2001
From: Policarpo Caballero <policarpocp@gmail.com>
Date: Wed, 9 Jul 2014 20:48:52 +0200
Subject: [PATCH] Fix magical staves always doing 0 damage (#8771)
---
crawl-ref/source/attack.cc | 2 +-
crawl-ref/source/melee_attack.cc | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc
index dcbee63..0f82240 100644
--- a/crawl-ref/source/attack.cc
+++ b/crawl-ref/source/attack.cc
@@ -1314,7 +1314,7 @@ int attack::get_weapon_plus()
{
if (weapon->base_type == OBJ_RODS)
return weapon->special;
- if (weapon->sub_type == WPN_BLOWGUN)
+ if (weapon->base_type == OBJ_STAVES || weapon->sub_type == WPN_BLOWGUN)
return 0;
return weapon->plus;
}
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index 569e96e..24c718a 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -3944,7 +3944,8 @@ bool melee_attack::using_weapon()
{
return weapon && ((weapon->base_type == OBJ_WEAPONS
&& !is_range_weapon(*weapon))
- || weapon->base_type == OBJ_RODS);
+ || weapon->base_type == OBJ_RODS
+ || weapon->base_type == OBJ_STAVES);
}
int melee_attack::weapon_damage()
--
2.0.1
|
|
|
Issue History |
|
Date Modified |
Username |
Field |
Change |
|
2014-07-08 22:50 |
minmay |
New Issue |
|
|
2014-07-08 22:59 |
PleasingFungus |
Relationship added |
related to 0008531 |
|
2014-07-09 21:00 |
CommanderC |
File Added: 0001-Fix-magical-staves-always-doing-0-damage-8771.patch |
|
|
2014-07-09 21:05 |
CommanderC |
Note Added: 0026716 |
|
|
2014-07-09 23:56 |
neil |
Note Added: 0026717 |
|
|
2014-07-09 23:56 |
neil |
Status |
new => resolved |
|
2014-07-09 23:56 |
neil |
Fixed in Branch |
=> 0.15 development branch |
|
2014-07-09 23:56 |
neil |
Resolution |
open => done |
|
2014-07-09 23:56 |
neil |
Assigned To |
=> neil |
|
2014-09-19 02:58 |
minmay |
Status |
resolved => closed |
|
2014-09-21 02:52 |
wheals |
Relationship replaced |
has duplicate 0008531 |