diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-25 10:49:19 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-25 10:49:19 +0000 |
| commit | 1661545d1b70fd6fdd7bb9261d9cc01a36aa909d (patch) | |
| tree | c65945885fc8b4530ed7586d2897e7bcade76936 /crawl-ref/source | |
| parent | 288f20074e505ca3eb70c0089de1295235d68ccc (diff) | |
| download | crawl-ref-1661545d1b70fd6fdd7bb9261d9cc01a36aa909d.tar.gz crawl-ref-1661545d1b70fd6fdd7bb9261d9cc01a36aa909d.zip | |
FR 1951252: Modify shafts to usually (50%) drop you two levels, and
sometimes (25% each) one or three.
FR 1951309: Disallow SeeInv + rPois properties for randart naga bardings
since naga already have those two as innate mutations, and there's no one else
capable of wearing them.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4615 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/directn.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/randart.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/traps.cc | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 8d21197f80..9c70996b98 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2008,7 +2008,7 @@ static std::string describe_monster_weapon(const monsters *mons) std::string desc = ""; std::string name1, name2; const item_def *weap = mons->mslot_item(MSLOT_WEAPON); - const item_def *alt = mons->mslot_item(MSLOT_ALT_WEAPON); + const item_def *alt = mons->mslot_item(MSLOT_ALT_WEAPON); if (weap) { diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index c17cf49a02..5f58edab16 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -877,7 +877,8 @@ void static _get_randart_properties(const item_def &item, && (aclass != OBJ_JEWELLERY || atype != RING_POISON_RESISTANCE) && (aclass != OBJ_ARMOUR || atype != ARM_GOLD_DRAGON_ARMOUR - || atype != ARM_SWAMP_DRAGON_ARMOUR)) + && atype != ARM_SWAMP_DRAGON_ARMOUR + && atype != ARM_NAGA_BARDING)) { proprt[RAP_POISON] = 1; power_level++; @@ -907,7 +908,8 @@ void static _get_randart_properties(const item_def &item, // see_invis if (!done_powers && one_chance_in(4 + power_level) - && (aclass != OBJ_JEWELLERY || atype != RING_INVISIBILITY)) + && (aclass != OBJ_JEWELLERY || atype != RING_INVISIBILITY) + && (aclass != OBJ_ARMOUR || atype != ARM_NAGA_BARDING)) { proprt[RAP_EYESIGHT] = 1; power_level++; diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index a074d15f2c..e3aeb77fdb 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -994,7 +994,14 @@ level_id generic_shaft_dest(level_pos lpos) int curr_depth = lid.depth; Branch &branch = branches[lid.branch]; - lid.depth += ((pos.x + pos.y) % 3) + 1; + // 25% drop one level + // 50% drop two levels + // 25% drop three levels + lid.depth += 2; + if (pos.x % 2) + lid.depth--; + if (pos.y % 2) + lid.depth++; if (lid.depth > branch.depth) lid.depth = branch.depth; |