Menu
▾
▴
[crawl-ref-commits] master branch updated: 0.13-a0-2550-g40d0fac
|
From: <gi...@cr...> - 2013-07-28 20:00:19
|
via 40d0fac4d07506d333b512350c2454f70454ac5a (commit)
via d93e8f602c464ae165c44072867787cc940153f8 (commit)
via 99c7b41c8c3221c3c71f80cd3284eac8ee8eef00 (commit)
from d34c657c4e4eff20e0d19b75d0e5214211384be8 (commit)
-----------------------------------------------------------------------
commit 40d0fac4d07506d333b512350c2454f70454ac5a
Author: Chris Campbell <chr...@gm...>
Date: Sun Jul 28 20:33:34 2013 +0100
Don't reduce dragon breath accuracy when wielding dragonslaying
It's a strange, minor effect that doesn't make much sense (the
justification that the monster avoids looking at the foe doesn't seem
to hold up since they cope in melee just fine).
commit d93e8f602c464ae165c44072867787cc940153f8
Author: Chris Campbell <chr...@gm...>
Date: Sun Jul 28 20:30:10 2013 +0100
Don't generate scythes of reaping
Nobody would use one anyway, and this way reaping is unique to
the Sword of Zonguldrok.
commit 99c7b41c8c3221c3c71f80cd3284eac8ee8eef00
Author: Chris Campbell <chr...@gm...>
Date: Sun Jul 28 18:38:54 2013 +0100
Adjust Gargoyle air/earth apts to -2/+2
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/aptitudes.h | 8 ++++----
crawl-ref/source/describe.cc | 3 +--
crawl-ref/source/makeitem.cc | 3 ---
crawl-ref/source/mon-cast.cc | 21 ---------------------
4 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h
index 6d3b624..465896d 100644
--- a/crawl-ref/source/aptitudes.h
+++ b/crawl-ref/source/aptitudes.h
@@ -999,13 +999,13 @@ static const species_skill_aptitude species_skill_aptitudes[] =
APT(SP_GARGOYLE, SK_BOWS, 0),
APT(SP_GARGOYLE, SK_CROSSBOWS, 0),
APT(SP_GARGOYLE, SK_THROWING, 0),
- APT(SP_GARGOYLE, SK_ARMOUR, +1),
+ APT(SP_GARGOYLE, SK_ARMOUR, 1),
APT(SP_GARGOYLE, SK_DODGING, -2),
APT(SP_GARGOYLE, SK_STEALTH, 2),
#if TAG_MAJOR_VERSION == 34
APT(SP_GARGOYLE, SK_STABBING, 0),
#endif
- APT(SP_GARGOYLE, SK_SHIELDS, +1),
+ APT(SP_GARGOYLE, SK_SHIELDS, 1),
#if TAG_MAJOR_VERSION == 34
APT(SP_GARGOYLE, SK_TRAPS, -1),
#endif
@@ -1020,8 +1020,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
APT(SP_GARGOYLE, SK_TRANSMUTATIONS, -2),
APT(SP_GARGOYLE, SK_FIRE_MAGIC, 0),
APT(SP_GARGOYLE, SK_ICE_MAGIC, 0),
- APT(SP_GARGOYLE, SK_AIR_MAGIC, -3),
- APT(SP_GARGOYLE, SK_EARTH_MAGIC, 3),
+ APT(SP_GARGOYLE, SK_AIR_MAGIC, -2),
+ APT(SP_GARGOYLE, SK_EARTH_MAGIC, 2),
APT(SP_GARGOYLE, SK_POISON_MAGIC, 0),
APT(SP_GARGOYLE, SK_INVOCATIONS, 1),
APT(SP_GARGOYLE, SK_EVOCATIONS, 0),
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index b9615dd..063190e 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -876,8 +876,7 @@ static string _describe_weapon(const item_def &item, bool verbose)
#endif
case SPWPN_DRAGON_SLAYING:
description += "This legendary weapon is deadly to all "
- "dragonkind. It also provides some protection from the "
- "breath attacks of dragons and other creatures.";
+ "dragonkind.";
break;
case SPWPN_VENOM:
if (is_range_weapon(item))
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 4e0b28c..2f1444f 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1325,9 +1325,6 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
if (one_chance_in(30))
rc = SPWPN_HOLY_WRATH;
- if (item.sub_type == WPN_SCYTHE && one_chance_in(6))
- rc = SPWPN_REAPING;
-
if (one_chance_in(4))
rc = SPWPN_PROTECTION;
// **** intentional fall through here ****
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index 4b241c9..94fd01b 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -990,27 +990,6 @@ bolt mons_spell_beam(monster* mons, spell_type spell_cast, int power,
if (spell_cast == SPELL_DRACONIAN_BREATH)
_scale_draconian_breath(beam, drac_type);
- // Accuracy is lowered by one quarter if the dragon is attacking
- // a target that is wielding a weapon of dragon slaying (which
- // makes the dragon/draconian avoid looking at the foe).
- // FIXME: This effect is not yet implemented for player draconians
- // or characters in dragon form breathing at monsters wielding a
- // weapon with this brand.
- if (is_dragonkind(mons))
- {
- if (actor *foe = mons->get_foe())
- {
- if (const item_def *weapon = foe->weapon())
- {
- if (get_weapon_brand(*weapon) == SPWPN_DRAGON_SLAYING)
- {
- beam.hit *= 3;
- beam.hit /= 4;
- }
- }
- }
- }
-
return beam;
}
--
Dungeon Crawl Stone Soup
|
