Menu
▾
▴
[crawl-ref-commits] master branch updated: 0.14-a0-57-ga934eff
|
From: <gi...@cr...> - 2013-09-30 00:30:10
|
via a934effbb3be05d964e052492ff03be49d734f40 (commit)
via 8eed426e8d0baaf5d8ebdb47817bfdc4e050d1af (commit)
from 908533aa02d86d162b7ddf6eb5b72babf5973ab7 (commit)
-----------------------------------------------------------------------
commit a934effbb3be05d964e052492ff03be49d734f40
Author: Chris Campbell <chr...@gm...>
Date: Wed Sep 25 19:56:39 2013 +0100
Update options_guide's advice on where to ask for help
commit 8eed426e8d0baaf5d8ebdb47817bfdc4e050d1af
Author: Shayne Halvorson <N7...@gm...>
Date: Wed Sep 25 19:40:21 2013 +0100
Reworked boots of the Assassin
Allows you to stab with short blade level bonuses, and provides radius 4
monster detection.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/docs/options_guide.txt | 8 ++++----
crawl-ref/source/art-data.txt | 3 ---
crawl-ref/source/dat/descript/unrand.txt | 4 ++--
crawl-ref/source/main.cc | 6 +++++-
crawl-ref/source/melee_attack.cc | 17 ++++++++++++++---
crawl-ref/source/mutation.cc | 5 +++++
6 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index dc2e953..06a2c2e 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -2,10 +2,10 @@ Guide to Crawl's options
========================
This document explains all of the options in the latest version of
-Dungeon Crawl Stone Soup. If you get stuck or some things won't seem to
-work properly, ask for help on the newsgroup rec.games.roguelike.misc.
-Please flag queries with '-crawl-', as other roguelikes are discussed
-there as well.
+Dungeon Crawl Stone Soup. If you get stuck or some things don't seem to
+work properly, ask for help in ##crawl on freenode, or on the Crawl
+forums at http://crawl.develz.org/tavern/.
+
The contents of this text are:
0- Generalities.
diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index 37c07ce..1a5d3cd 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -728,7 +728,6 @@ TILE_EQ: red
EV: 4
BOOL: fly
-# TAG_MAJOR_VERSION == 34
ENUM: BOOTS_ASSASSIN
NAME: boots of the Assassin
OBJ: OBJ_ARMOUR/ARM_BOOTS
@@ -736,9 +735,7 @@ PLUS: +2
COLOUR: BROWN
TILE: urand_assassin
TILE_EQ: middle_gray
-DEX: 3
STEALTH: 80
-BOOL: inv, nogen
ENUM: LEAR
NAME: Lear's hauberk
diff --git a/crawl-ref/source/dat/descript/unrand.txt b/crawl-ref/source/dat/descript/unrand.txt
index 08bc39e..97b66aa 100644
--- a/crawl-ref/source/dat/descript/unrand.txt
+++ b/crawl-ref/source/dat/descript/unrand.txt
@@ -277,10 +277,10 @@ cloak of Flash
A vibrating cloak.
%%%%
-# TAG_MAJOR_VERSION == 34
boots of the Assassin
-Some soft boots, specially designed by the Assassin's Guild.
+Some soft boots with a concealed dagger inside, specially designed by the
+Assassin's Guild. It makes the wearer more perceptive of potential victims.
%%%%
Lear's hauberk
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 6415497..3914a1b 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -3338,8 +3338,12 @@ static void _player_reacts_to_monsters()
manage_fire_shield(you.time_taken);
// penance checked there (as you can have antennae too)
- if (player_mutation_level(MUT_ANTENNAE) || you_worship(GOD_ASHENZARI))
+ if (player_mutation_level(MUT_ANTENNAE)
+ || you_worship(GOD_ASHENZARI)
+ || player_equip_unrand(UNRAND_BOOTS_ASSASSIN))
+ {
check_antennae_detect();
+ }
if ((you_worship(GOD_ASHENZARI) && !player_under_penance())
|| you.mutation[MUT_JELLY_GROWTH])
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index 75bce0c..79217e1 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -1858,6 +1858,8 @@ int melee_attack::player_apply_final_multipliers(int damage)
int melee_attack::player_stab_weapon_bonus(int damage)
{
int stab_skill = you.skill(wpn_skill, 50) + you.skill(SK_STEALTH, 50);
+ int modified_wpn_skill = (player_equip_unrand(UNRAND_BOOTS_ASSASSIN)
+ ? SK_SHORT_BLADES : wpn_skill);
if (weapon && weapon->base_type == OBJ_WEAPONS
&& (weapon->sub_type == WPN_CLUB
@@ -1870,13 +1872,14 @@ int melee_attack::player_stab_weapon_bonus(int damage)
goto ok_weaps;
}
- switch (wpn_skill)
+ switch (modified_wpn_skill)
{
case SK_SHORT_BLADES:
{
int bonus = (you.dex() * (stab_skill + 100)) / 500;
- if (weapon->sub_type != WPN_DAGGER)
+ // We might be unarmed if we're using the boots of the Assassin.
+ if (!weapon || weapon->sub_type != WPN_DAGGER)
bonus /= 2;
bonus = stepdown_value(bonus, 10, 10, 30, 30);
@@ -1886,7 +1889,7 @@ int melee_attack::player_stab_weapon_bonus(int damage)
ok_weaps:
case SK_LONG_BLADES:
damage *= 10 + div_rand_round(stab_skill, 100 *
- (stab_bonus + (wpn_skill == SK_SHORT_BLADES ? 0 : 2)));
+ (stab_bonus + (modified_wpn_skill == SK_SHORT_BLADES ? 0 : 2)));
damage /= 10;
// fall through
default:
@@ -1957,6 +1960,14 @@ void melee_attack::set_attack_verb()
return;
}
+ // Special message for stabs while wearing the Boots of the Assassin.
+ if (player_equip_unrand(UNRAND_BOOTS_ASSASSIN) && stab_attempt && stab_bonus > 0)
+ {
+ attack_verb = "stab";
+ verb_degree = "with your concealed dagger";
+ return;
+ }
+
// Take normal hits into account. If the hit is from a weapon with
// more than one damage type, randomly choose one damage type from
// it.
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index cfd75bd..e5a0569 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -16,6 +16,8 @@
#include "externs.h"
#include "abl-show.h"
+#include "art-enum.h"
+#include "artefact.h"
#include "cio.h"
#include "coordit.h"
#include "delay.h"
@@ -2547,6 +2549,9 @@ void check_demonic_guardian()
void check_antennae_detect()
{
int radius = player_mutation_level(MUT_ANTENNAE) * 2;
+
+ if (player_equip_unrand(UNRAND_BOOTS_ASSASSIN))
+ radius = max(radius, 4);
if (you_worship(GOD_ASHENZARI) && !player_under_penance())
radius = max(radius, you.piety / 20);
if (radius <= 0)
--
Dungeon Crawl Stone Soup
|
