From 4476ddab6e13bedbbd9291bb030fe70b117b4f47 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Fri, 11 Dec 2009 17:02:39 +0100 Subject: Add a new guardian serpent tile. Move guardian naga tile -> UNUSED. --- crawl-ref/source/rltiles/dc-mon/guardian_naga.png | Bin 982 -> 0 bytes crawl-ref/source/rltiles/dc-mon/guardian_serpent.png | Bin 0 -> 910 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 crawl-ref/source/rltiles/dc-mon/guardian_naga.png create mode 100644 crawl-ref/source/rltiles/dc-mon/guardian_serpent.png (limited to 'crawl-ref/source/rltiles/dc-mon') diff --git a/crawl-ref/source/rltiles/dc-mon/guardian_naga.png b/crawl-ref/source/rltiles/dc-mon/guardian_naga.png deleted file mode 100644 index aa7aed8e08..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/guardian_naga.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/guardian_serpent.png b/crawl-ref/source/rltiles/dc-mon/guardian_serpent.png new file mode 100644 index 0000000000..dcddb5e2e9 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/guardian_serpent.png differ -- cgit v1.2.3-54-g00ecf From 3773414c38457e28099d0bc769444425defdd847 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Sun, 13 Dec 2009 16:00:13 +0100 Subject: Use a recoloured guardian serpent tile for Aizul. Also add an older tile of Aizul I made before the guardian serpent decision into the UNUSED tiles folder. We can use it for some (other) naga unique. --- .../rltiles/UNUSED/monsters/naga_warrior_unique.png | Bin 0 -> 970 bytes crawl-ref/source/rltiles/dc-mon.txt | 3 +++ crawl-ref/source/rltiles/dc-mon/unique/aizul.png | Bin 0 -> 902 bytes crawl-ref/source/tilepick.cc | 2 ++ 4 files changed, 5 insertions(+) create mode 100644 crawl-ref/source/rltiles/UNUSED/monsters/naga_warrior_unique.png create mode 100644 crawl-ref/source/rltiles/dc-mon/unique/aizul.png (limited to 'crawl-ref/source/rltiles/dc-mon') diff --git a/crawl-ref/source/rltiles/UNUSED/monsters/naga_warrior_unique.png b/crawl-ref/source/rltiles/UNUSED/monsters/naga_warrior_unique.png new file mode 100644 index 0000000000..dc580c3c57 Binary files /dev/null and b/crawl-ref/source/rltiles/UNUSED/monsters/naga_warrior_unique.png differ diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 55e5ff9072..cc73f2c334 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -436,6 +436,9 @@ greater_mummy MONS_GREATER_MUMMY mummy_priest MONS_MUMMY_PRIEST ## Nagas ('N') +%sdir dc-mon/unique +aizul MONS_AIZUL +%sdir dc-mon naga MONS_NAGA naga_mage MONS_NAGA_MAGE naga_warrior MONS_NAGA_WARRIOR diff --git a/crawl-ref/source/rltiles/dc-mon/unique/aizul.png b/crawl-ref/source/rltiles/dc-mon/unique/aizul.png new file mode 100644 index 0000000000..89098d2f68 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/unique/aizul.png differ diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 68a93a214a..b28754742a 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -972,6 +972,8 @@ int tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_LERNAEAN_HYDRA; case MONS_DISSOLUTION: return TILEP_MONS_DISSOLUTION; + case MONS_AIZUL: + return TILEP_MONS_AIZUL; // human uniques ('@') case MONS_TERENCE: -- cgit v1.2.3-54-g00ecf From 8e05ca48a48d94c40d0f07ac5961a0ebbcf3becf Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Sun, 13 Dec 2009 16:02:26 +0100 Subject: Replace the giant leech tile with a version that should be more visible. --- .../source/rltiles/UNUSED/monsters/giant_leech.png | Bin 0 -> 781 bytes crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png | Bin 781 -> 690 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 crawl-ref/source/rltiles/UNUSED/monsters/giant_leech.png (limited to 'crawl-ref/source/rltiles/dc-mon') diff --git a/crawl-ref/source/rltiles/UNUSED/monsters/giant_leech.png b/crawl-ref/source/rltiles/UNUSED/monsters/giant_leech.png new file mode 100644 index 0000000000..7bb57ead17 Binary files /dev/null and b/crawl-ref/source/rltiles/UNUSED/monsters/giant_leech.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png index 7bb57ead17..fd886aecbc 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png and b/crawl-ref/source/rltiles/dc-mon/animals/giant_leech.png differ -- cgit v1.2.3-54-g00ecf From ada4ca321b5efa5b35ebe67c065d050b2704b6e7 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Sun, 13 Dec 2009 18:22:17 +0100 Subject: Really add the Crazy Yiuf tile. --- crawl-ref/source/rltiles/dc-mon/unique/crazy_yiuf.png | Bin 0 -> 1079 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/unique/crazy_yiuf.png (limited to 'crawl-ref/source/rltiles/dc-mon') diff --git a/crawl-ref/source/rltiles/dc-mon/unique/crazy_yiuf.png b/crawl-ref/source/rltiles/dc-mon/unique/crazy_yiuf.png new file mode 100644 index 0000000000..4f2ea63dd9 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/unique/crazy_yiuf.png differ -- cgit v1.2.3-54-g00ecf From 1ad4408f777422c5ac66d98568101bdd1519feec Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Wed, 16 Dec 2009 14:10:31 +0100 Subject: Rename grey snakes to anacondas. Give them constriction, message-only for now. --- crawl-ref/source/enum.h | 2 +- crawl-ref/source/fight.cc | 11 ++++++++++- crawl-ref/source/mon-data.h | 6 +++--- crawl-ref/source/mon-pick.cc | 4 ++-- crawl-ref/source/mon-util.h | 4 +++- crawl-ref/source/rltiles/dc-corpse.txt | 2 +- crawl-ref/source/rltiles/dc-mon.txt | 2 +- crawl-ref/source/rltiles/dc-mon/animals/anaconda.png | Bin 0 -> 747 bytes crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png | Bin 747 -> 0 bytes crawl-ref/source/spells2.cc | 2 +- crawl-ref/source/tilepick.cc | 8 ++++---- 11 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/animals/anaconda.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png (limited to 'crawl-ref/source/rltiles/dc-mon') diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index cec66b0228..7938b7fa1d 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1781,7 +1781,7 @@ enum monster_type // (int) menv[].type MONS_FIRE_DRAKE, MONS_SHADOW_DRAGON, // 165 MONS_VIPER, - MONS_GREY_SNAKE, + MONS_ANACONDA, MONS_DEEP_TROLL, MONS_GIANT_BLOWFLY, MONS_RED_WASP, // 170 diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 52568110c1..91397a6fe9 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4530,7 +4530,8 @@ std::string melee_attack::mons_attack_verb(const mon_attack_def &attk) "kick", "tentacle-slap", "tail-slap", - "gore" + "gore", + "constrict" }; return (attack_types[attk.type]); @@ -5186,6 +5187,13 @@ void melee_attack::mons_apply_attack_flavour(const mon_attack_def &attk) atk_name(DESC_CAP_THE).c_str()); } break; + + case AF_CRUSH: + mprf("%s %s being crushed%s", + def_name(DESC_CAP_THE).c_str(), + defender->conj_verb("are").c_str(), + special_attack_punctuation().c_str()); + break; } } @@ -5299,6 +5307,7 @@ void melee_attack::mons_perform_attack_rounds() case AT_BITE: case AT_PECK: + case AT_CONSTRICT: noise_factor = 100; break; diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 965ef2314a..e9094329bd 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -2890,11 +2890,11 @@ static monsterentry mondata[] = { }, { - MONS_GREY_SNAKE, 'S', LIGHTGREY, "grey snake", + MONS_ANACONDA, 'S', LIGHTGREY, "anaconda", M_COLD_BLOOD, MR_NO_FLAGS, - 600, 10, MONS_SNAKE, MONS_GREY_SNAKE, MH_NATURAL, -3, - { {AT_BITE, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, + 600, 10, MONS_SNAKE, MONS_ANACONDA, MH_NATURAL, -3, + { {AT_CONSTRICT, AF_CRUSH, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 11, 3, 5, 0 }, 4, 16, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, I_INSECT, HT_LAND, FL_NONE, 18, DEFAULT_ENERGY, diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index 30ca498b07..84d540d8c8 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -1800,7 +1800,7 @@ int mons_pitsnake_level(int mcls) case MONS_WATER_MOCCASIN: case MONS_BLACK_MAMBA: case MONS_VIPER: - case MONS_GREY_SNAKE: + case MONS_ANACONDA: case MONS_NAGA: mlev += 2; break; @@ -1844,7 +1844,7 @@ int mons_pitsnake_rare(int mcls) return 34; case MONS_VIPER: - case MONS_GREY_SNAKE: + case MONS_ANACONDA: return 32; case MONS_GREATER_NAGA: diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 7858c51167..b9c5424aee 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -51,6 +51,7 @@ enum mon_attack_type AT_TENTACLE_SLAP, AT_TAIL_SLAP, AT_GORE, + AT_CONSTRICT, AT_SHOOT, // Attack representing missile damage for M_ARCHER. AT_WEAP_ONLY, // Ranged weap: shoot point-blank like AT_SHOOT, melee weap: @@ -87,7 +88,8 @@ enum mon_attack_flavour AF_NAPALM, AF_CHAOS, AF_STEAL, - AF_STEAL_FOOD + AF_STEAL_FOOD, + AF_CRUSH }; // Non-spell "summoning" types to give to monsters::mark_summoned(), or diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt index 5607d22cf7..f947bf65b0 100644 --- a/crawl-ref/source/rltiles/dc-corpse.txt +++ b/crawl-ref/source/rltiles/dc-corpse.txt @@ -107,7 +107,7 @@ small_snake CORPSE_SMALL_SNAKE snake CORPSE_SNAKE black_mamba CORPSE_BLACK_MAMBA water_moccasin CORPSE_WATER_MOCCASIN -grey_snake CORPSE_GREY_SNAKE +anaconda CORPSE_ANACONDA viper CORPSE_VIPER ## Bears ('U') diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index f629e1d0e0..4afbdba3c8 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -129,7 +129,7 @@ small_snake MONS_SMALL_SNAKE snake MONS_SNAKE black_mamba MONS_BLACK_MAMBA water_moccasin MONS_WATER_MOCCASIN -grey_snake MONS_GREY_SNAKE +anaconda MONS_ANACONDA lava_snake MONS_LAVA_SNAKE viper MONS_VIPER salamander MONS_SALAMANDER diff --git a/crawl-ref/source/rltiles/dc-mon/animals/anaconda.png b/crawl-ref/source/rltiles/dc-mon/animals/anaconda.png new file mode 100644 index 0000000000..2da9df3b93 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/animals/anaconda.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png deleted file mode 100644 index 2da9df3b93..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png and /dev/null differ diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 66d30c6629..0e3dcb1aea 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1154,7 +1154,7 @@ bool cast_sticks_to_snakes(int pow, god_type god) mon = MONS_BLACK_MAMBA; if (pow > 90 && one_chance_in(3)) - mon = MONS_GREY_SNAKE; + mon = MONS_ANACONDA; if (create_monster( mgen_data(mon, beha, &you, diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 3d2794ecd8..af9293e656 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -642,8 +642,8 @@ int tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_BLACK_MAMBA; case MONS_VIPER: return TILEP_MONS_VIPER; - case MONS_GREY_SNAKE: - return TILEP_MONS_GREY_SNAKE; + case MONS_ANACONDA: + return TILEP_MONS_ANACONDA; // trolls ('T') case MONS_TROLL: @@ -1958,8 +1958,8 @@ static int _tileidx_corpse(const item_def &item) return TILE_CORPSE_SMALL_SNAKE; case MONS_SNAKE: return TILE_CORPSE_SNAKE; - case MONS_GREY_SNAKE: - return TILE_CORPSE_GREY_SNAKE; + case MONS_ANACONDA: + return TILE_CORPSE_ANACONDA; case MONS_WATER_MOCCASIN: return TILE_CORPSE_WATER_MOCCASIN; case MONS_BLACK_MAMBA: -- cgit v1.2.3-54-g00ecf From 761b088e911386a2860ba50a8a3271739264283c Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Thu, 17 Dec 2009 01:53:40 +0100 Subject: Add a tile for Maurice. :) Might be a bit too hard to see on some textures, though I tested it in all branches. --- crawl-ref/source/rltiles/dc-mon.txt | 1 + crawl-ref/source/rltiles/dc-mon/unique/maurice.png | Bin 0 -> 902 bytes crawl-ref/source/tilemcache.cc | 4 ++++ crawl-ref/source/tilepick.cc | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/unique/maurice.png (limited to 'crawl-ref/source/rltiles/dc-mon') diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 4afbdba3c8..a0c777ed1a 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -309,6 +309,7 @@ kirke MONS_KIRKE louise MONS_LOUISE margery MONS_MARGERY maud MONS_MAUD +maurice MONS_MAURICE norbert MONS_NORBERT norris MONS_NORRIS psyche MONS_PSYCHE diff --git a/crawl-ref/source/rltiles/dc-mon/unique/maurice.png b/crawl-ref/source/rltiles/dc-mon/unique/maurice.png new file mode 100644 index 0000000000..284ad4645c Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/unique/maurice.png differ diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc index aab46530fd..2a6ff9f6f8 100644 --- a/crawl-ref/source/tilemcache.cc +++ b/crawl-ref/source/tilemcache.cc @@ -443,6 +443,10 @@ bool mcache_monster::get_weapon_offset(int mon_tile, int &ofs_x, int &ofs_y) ofs_x = -1; ofs_y = -3; break; + case TILEP_MONS_MAURICE: + ofs_x = -2; + ofs_y = -2; + break; case TILEP_MONS_SONJA: ofs_x = -2; ofs_y = -7; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index af9293e656..258ce242ba 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1081,7 +1081,7 @@ int tileidx_monster_base(const monsters *mon, bool detected) case MONS_NIKOLA: return TILEP_TODO; // TODO case MONS_MAURICE: - return TILEP_TODO; // TODO + return TILEP_MONS_MAURICE; // unique major demons ('&') case MONS_MNOLEG: -- cgit v1.2.3-54-g00ecf