Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove Cerebovscumming
Don't allow players to get multiple copies of cerebov's sword by
taking his rune and then repeatedly disarming him as he pursues
you throughout pan. CRITICAL BALANCE FIX

Also, add a tile for cerebov-sans-sword.

(Sorry to whoever reported this! I didn't include your name in
my notes...)
  • Loading branch information
PleasingFungus committed Jan 14, 2017
1 parent ed69ad6 commit 22d579f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions crawl-ref/source/mon-gear.cc
Expand Up @@ -1150,6 +1150,8 @@ int make_mons_weapon(monster_type type, int level, bool melee_only)
break;

case MONS_CEREBOV:
if (you.props.exists(CEREBOV_DISARMED_KEY))
break;
force_item = true;
make_item_unrandart(item, UNRAND_CEREBOV);
break;
Expand Down
3 changes: 3 additions & 0 deletions crawl-ref/source/monster.cc
Expand Up @@ -6456,6 +6456,9 @@ item_def* monster::disarm()
if (your_tile_ok)
move_top_item(pos(), you.pos());

if (type == MONS_CEREBOV)
you.props[CEREBOV_DISARMED_KEY] = true;

return mons_wpn;
}

Expand Down
1 change: 1 addition & 0 deletions crawl-ref/source/monster.h
Expand Up @@ -18,6 +18,7 @@ const int KRAKEN_TENTACLE_RANGE = 3;
#define VAULT_HD_KEY "vault_hd"

#define FAKE_BLINK_KEY "fake_blink"
#define CEREBOV_DISARMED_KEY "cerebov_disarmed"

/// has a given hound already used up its howl?
#define DOOM_HOUND_HOWLED_KEY "doom_hound_howled"
Expand Down
1 change: 1 addition & 0 deletions crawl-ref/source/rltiles/dc-mon.txt
Expand Up @@ -8,6 +8,7 @@ misc/error MONS_PROGRAM_BUG
%rim 0
asmodeus MONS_ASMODEUS
cerebov MONS_CEREBOV
cerebov_swordless MONS_CEREBOV_SWORDLESS
dispater MONS_DISPATER
ereshkigal MONS_ERESHKIGAL
gloorx_vloq MONS_GLOORX_VLOQ
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions crawl-ref/source/tilepick.cc
Expand Up @@ -1624,6 +1624,9 @@ static tileidx_t _tileidx_monster_no_props(const monster_info& mon)
case MONS_YAKTAUR_CAPTAIN:
return base + (_bow_offset(mon) ? 1 : 0);

case MONS_CEREBOV:
return base + (mon.inv[MSLOT_WEAPON].get() == nullptr ? 1 : 0);

case MONS_SLAVE:
return base + (mon.mname == "freed slave" ? 1 : 0);

Expand Down

0 comments on commit 22d579f

Please sign in to comment.