From 14ef20154318f3605e37aebdc2a5766f761d3177 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 28 Jun 2009 18:28:54 +0000 Subject: Applying Eino's patches renaming snakes and eels. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10069 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/docs/monster_speech.txt | 2 +- crawl-ref/settings/034_monster_glyphs.txt | 4 +-- crawl-ref/source/dat/descript/monsters.txt | 14 ++++----- crawl-ref/source/dat/entry.des | 2 +- crawl-ref/source/dat/float.des | 6 ++-- crawl-ref/source/dat/hive.des | 2 +- crawl-ref/source/dat/lair.des | 4 +-- crawl-ref/source/dat/large.des | 2 +- crawl-ref/source/dat/mini.des | 18 +++++------ crawl-ref/source/dat/ossuary.des | 2 +- crawl-ref/source/dat/temple.des | 2 +- crawl-ref/source/enum.h | 8 ++--- crawl-ref/source/it_use3.cc | 2 +- crawl-ref/source/mon-data.h | 16 +++++----- crawl-ref/source/mon-pick.cc | 34 ++++++++++----------- crawl-ref/source/mon-util.cc | 8 ++--- crawl-ref/source/monstuff.cc | 2 +- crawl-ref/source/rltiles/dc-corpse.txt | 6 ++-- crawl-ref/source/rltiles/dc-mon.txt | 8 ++--- .../source/rltiles/dc-mon/animals/black_mamba.png | Bin 0 -> 686 bytes .../source/rltiles/dc-mon/animals/black_snake.png | Bin 686 -> 0 bytes .../source/rltiles/dc-mon/animals/brown_snake.png | Bin 734 -> 0 bytes .../source/rltiles/dc-mon/animals/electric_eel.png | Bin 0 -> 795 bytes .../rltiles/dc-mon/animals/electrical_eel.png | Bin 795 -> 0 bytes crawl-ref/source/rltiles/dc-mon/animals/viper.png | Bin 0 -> 777 bytes .../rltiles/dc-mon/animals/water_moccasin.png | Bin 0 -> 734 bytes .../source/rltiles/dc-mon/animals/yellow_snake.png | Bin 777 -> 0 bytes crawl-ref/source/spells2.cc | 12 ++++---- crawl-ref/source/tilepick.cc | 28 ++++++++--------- 29 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/animals/black_mamba.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/animals/black_snake.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/animals/brown_snake.png create mode 100644 crawl-ref/source/rltiles/dc-mon/animals/electric_eel.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/animals/electrical_eel.png create mode 100644 crawl-ref/source/rltiles/dc-mon/animals/viper.png create mode 100644 crawl-ref/source/rltiles/dc-mon/animals/water_moccasin.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/animals/yellow_snake.png (limited to 'crawl-ref') diff --git a/crawl-ref/docs/monster_speech.txt b/crawl-ref/docs/monster_speech.txt index af4c6a460c..c1e2e3f80e 100644 --- a/crawl-ref/docs/monster_speech.txt +++ b/crawl-ref/docs/monster_speech.txt @@ -889,7 +889,7 @@ Other symbols: -------------- # earth elemental, fire elemental, and vapour { water elemental -; all fish, and electrical eel +; all fish, and electric eel @ all humans, (glowing) shapeshifter, and Killer Klown & all pandemonium lords * ball lightning, and orb of fire diff --git a/crawl-ref/settings/034_monster_glyphs.txt b/crawl-ref/settings/034_monster_glyphs.txt index 9d4915acdf..0a20b321b6 100644 --- a/crawl-ref/settings/034_monster_glyphs.txt +++ b/crawl-ref/settings/034_monster_glyphs.txt @@ -75,7 +75,7 @@ mon_glyph = gila monster : black # snakes and nagas mon_glyph = small snake : lightgreen mon_glyph = snake : green -mon_glyph = black snake : darkgrey +mon_glyph = black mamba : darkgrey mon_glyph = greater naga : red mon_glyph = naga mage : lightred @@ -205,7 +205,7 @@ mon_glyph = Frederick : darkgrey # snakes and naga # small snake lightgreen green # snake green lightgreen -# black snake darkgrey blue +# black mamba darkgrey blue # greater naga red lightred # naga mage lightred red # diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index 5ddb79b85b..11c2674e55 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -352,9 +352,9 @@ black draconian Before you stands a draconian. %%%% -black snake +black mamba -A large black snake. +A large black tropical snake with the deadliest of all venoms. %%%% blink frog @@ -384,9 +384,9 @@ brown ooze A viscous liquid, flowing along the floor in search of organic matter to corrode. %%%% -brown snake +water moccasin -A large brown snake. +A largish venomous brown snake. It usually lives near water, and is an able swimmer. %%%% bumblebee @@ -557,7 +557,7 @@ electric golem An animated figure made completely of electricity. %%%% -electrical eel +electric eel A small and slimy eel, crackling with electrical discharge. %%%% @@ -1485,9 +1485,9 @@ yellow draconian Before you stands a draconian. %%%% -yellow snake +viper -A large yellow tubular reptile. +A yellow-scaled snake with a painful venom. It's not as fast as some other snakes, but still fairly quick. %%%% yellow wasp diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des index 2a05f306a4..e2147a4775 100644 --- a/crawl-ref/source/dat/entry.des +++ b/crawl-ref/source/dat/entry.des @@ -4466,7 +4466,7 @@ MONS: giant cockroach / giant ant / butterfly / killer bee / bumblebee /\ MONS: swamp worm / lindwurm / worm / spiny worm MONS: swamp drake / hydra / wyvern / firedrake MONS: bear / polar bear / grizzly bear / black bear -MONS: black snake / brown snake / grey snake / salamander / yellow snake +MONS: black mamba / water moccasin / grey snake / salamander / viper MAP xxxxxxxx@xxxxxxxx xxxxxx.G.G.xxxxxx diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des index fead2fa584..8dfc4108bf 100644 --- a/crawl-ref/source/dat/float.des +++ b/crawl-ref/source/dat/float.des @@ -533,9 +533,9 @@ KFEAT: G = x / . / w / W KFEAT: H = . / W KMONS: D = Plant / w:200 nothing KMONS: E = w:2 slime creature / swamp worm / giant blowfly /\ - w:2 giant mosquito / w:1 electrical eel / w:1000 nothing + w:2 giant mosquito / w:1 electric eel / w:1000 nothing KMONS: F = w:2 slime creature / swamp worm / giant blowfly /\ - w:2 giant mosquito / w:2 electrical eel / w:1000 nothing + w:2 giant mosquito / w:2 electric eel / w:1000 nothing KMONS: H = swamp drake / swamp dragon / hydra / w:20 nothing KITEM: H = any good_item / any potion / w:20 nothing / gold MAP @@ -567,7 +567,7 @@ DEPTH: D:10-13, Lair, Snake ORIENT: float MONS: giant gecko / giant newt, giant lizard, giant iguana MONS: firedrake / swamp drake -MONS: snake, brown snake, yellow snake +MONS: snake, water moccasin, viper SUBST: 4 = 34 SUBST: 3 = 3:20 2 SUBST: 2 = 2:20 1 diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des index 3008e352e4..abc9b4c413 100644 --- a/crawl-ref/source/dat/hive.des +++ b/crawl-ref/source/dat/hive.des @@ -375,7 +375,7 @@ ENDMAP NAME: lemuel_troublesome_eels DEPTH: Hive:* KFEAT: X = deep_water -KMONS: X = electrical eel +KMONS: X = electric eel SUBST: W=w1. SUBST: . = 1:1 . SUBST: 1 = 1 .:5 diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des index 7df4edb5ae..d4994ded9f 100644 --- a/crawl-ref/source/dat/lair.des +++ b/crawl-ref/source/dat/lair.des @@ -583,7 +583,7 @@ TAGS: allow_dup no_monster_gen no_item_gen mini_float MONS: w:5 death drake / ice dragon / dragon / swamp dragon MONS: swamp dragon / hydra / grey snake MONS: swamp drake / w:20 spiny frog / w:20 komodo dragon /\ - w:20 gila monster / w:20 black snake + w:20 gila monster / w:20 black mamba : if you.absdepth() >= 18 then SUBST: M = 1:1 2:9 3:20 : elseif you.absdepth() >= 13 then @@ -817,7 +817,7 @@ MONS: cyclops,stone giant SUBST: 1 = 1. SUBST: W = W:2 w SUBST: . = . w:3 -KMONS: W = giant goldfish/big fish/electrical eel +KMONS: W = giant goldfish/big fish/electric eel KFEAT: W = w MAP wwwww......11......wwwww diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des index e6daf229d8..b316f3c8d9 100644 --- a/crawl-ref/source/dat/large.des +++ b/crawl-ref/source/dat/large.des @@ -994,7 +994,7 @@ ITEM: ring of teleportation ITEM: royal jelly / honeycomb w:20 / nothing w:30 ITEM: scroll of teleportation KFEAT: T = teleport trap -KMONS: w = electrical eel / jellyfish / nothing w:120 +KMONS: w = electric eel / jellyfish / nothing w:120 KFEAT: w = w KMONS: l = fire vortex / lava snake / lava fish / fire elemental w:1 /\ nothing w:50 diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des index 1c7aa82bd0..7e3d73b29b 100644 --- a/crawl-ref/source/dat/mini.des +++ b/crawl-ref/source/dat/mini.des @@ -852,8 +852,8 @@ xxxx xxxx x**x x**x x**+..+**x xx+x..x+xx - ...... - ...... + ...... + ...... xx+x..x+xx x**+..+**x x**x x**x @@ -1412,8 +1412,8 @@ ENDMAP #DEPTH: D:8-13 #TAGS: no_monster_gen no_pool_fixup #KMONS: 1 = centaur -#KMONS: 2 = brown snake -#KMONS: 3 = electrical eel +#KMONS: 2 = water moccasin +#KMONS: 3 = electric eel #ITEM: bread ration/meat ration/royal jelly/potion of porridge, good_item cloak/any book #SHUFFLE: !; #SUBST: " = .:80 W:30 @@ -1454,7 +1454,7 @@ ENDMAP #KFEAT: | = W / . #KFEAT: d = W / . #KFEAT: e = W / . -#KFEAT: 2 = W +#KFEAT: 2 = W #SUBST: ; = .:80 W:30 #SUBST: " = .:80 W:30 #SUBST: ! = w:20 W ? c @@ -1696,7 +1696,7 @@ TAGS: mini_float patrolling DEPTH: 5-26, !Lair, !Orc, !Tomb NSUBST: k = 4=k / *= .:19 k:1 KITEM: S = good_item long sword / good_item great sword / good_item katana /\ - good_item triple sword / good_item double sword + good_item triple sword / good_item double sword KFEAT: S = teleport trap NSUBST: n = n/cbn : if you.absdepth() < 10 then @@ -1764,7 +1764,7 @@ MAP ENDMAP ################################################################################ -# Some earlyish demon minivaults by Eino. +# Some earlyish demon minivaults by Eino. # The difficulty of most low-tier demons is severely inflated by the time the # player gets to meet them. Here (using default depth) they aspire to be both # challenging and flavourful. @@ -1899,7 +1899,7 @@ ENDMAP # A number of flamethrower vaults (Lemuel) # # This next bunch are "flamethrowers" -- flame appears at the end of the -# little corridor and a couple turns later spreads out of it. If you see +# little corridor and a couple turns later spreads out of it. If you see # fire, get clear! # Again, these rely on statues to halt autoexplore. # Yes, you can cook monsters with it, but (1) you may get burned yourself @@ -2236,7 +2236,7 @@ ENDMAP ################################################################# # Flames and gold (Lemuel) # No safe path in this one -- just got to take your chances! -# +# NAME: flames_and_gold DEPTH: D:16-27 WEIGHT: 2 diff --git a/crawl-ref/source/dat/ossuary.des b/crawl-ref/source/dat/ossuary.des index b00bdfc606..fff9a937e1 100644 --- a/crawl-ref/source/dat/ossuary.des +++ b/crawl-ref/source/dat/ossuary.des @@ -313,7 +313,7 @@ NSUBST: K = 1:= / *:c # loot: 12 items ITEM: any scroll w:6 / any potion / any potion q:2 w:2 MONS: snake zombie / hobgoblin zombie / orc zombie / kobold zombie / nothing -MONS: big kobold zombie / brown snake zombie / gnoll zombie / nothing +MONS: big kobold zombie / water moccasin zombie / gnoll zombie / nothing MONS: mummy : ossuary_setup_features(_G) MAP diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des index dadb78b833..e6333d88b1 100644 --- a/crawl-ref/source/dat/temple.des +++ b/crawl-ref/source/dat/temple.des @@ -598,7 +598,7 @@ SUBST: W : mvbG SUBST: W = w NSUBST: w = 6:1 / *:w KFEAT: 1 = w -KMONS: 1 = giant goldfish / electrical eel / big fish +KMONS: 1 = giant goldfish / electric eel / big fish : else SUBST: W = w :end diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 67d799ef05..e92bbf9baa 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1725,7 +1725,7 @@ enum monster_type // (int) menv[].type MONS_AIR_ELEMENTAL, // 125 MONS_ICE_FIEND, MONS_SHADOW_FIEND, - MONS_BROWN_SNAKE, + MONS_WATER_MOCCASIN, MONS_GIANT_LIZARD, MONS_SPECTRAL_WARRIOR, // 130 MONS_PULSATING_LUMP, @@ -1751,7 +1751,7 @@ enum monster_type // (int) menv[].type MONS_GREY_RAT, MONS_GREEN_RAT, MONS_ORANGE_RAT, - MONS_BLACK_SNAKE, + MONS_BLACK_MAMBA, MONS_SHEEP, // 155 MONS_GHOUL, MONS_HOG, @@ -1763,7 +1763,7 @@ enum monster_type // (int) menv[].type MONS_FROST_GIANT, MONS_FIREDRAKE, MONS_SHADOW_DRAGON, // 165 - MONS_YELLOW_SNAKE, + MONS_VIPER, MONS_GREY_SNAKE, MONS_DEEP_TROLL, MONS_GIANT_BLOWFLY, @@ -1993,7 +1993,7 @@ enum monster_type // (int) menv[].type // Water monsters: MONS_BIG_FISH = 430, // 430 MONS_GIANT_GOLDFISH, - MONS_ELECTRICAL_EEL, + MONS_ELECTRIC_EEL, MONS_JELLYFISH, MONS_WATER_ELEMENTAL, MONS_SWAMP_WORM, // 435 diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index 6fb7225d66..70b845c83a 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -595,7 +595,7 @@ static bool _box_of_beasts(item_def &box) (temp_rand == 5) ? MONS_SNAKE : (temp_rand == 6) ? MONS_YAK : (temp_rand == 7) ? MONS_BUTTERFLY : - (temp_rand == 8) ? MONS_BROWN_SNAKE : + (temp_rand == 8) ? MONS_WATER_MOCCASIN : (temp_rand == 9) ? MONS_GIANT_LIZARD : MONS_HELL_HOUND); } diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 08e1fed7d0..b29e27af6d 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -2572,10 +2572,10 @@ static monsterentry mondata[] = { }, { - MONS_BROWN_SNAKE, 'S', BROWN, "brown snake", + MONS_WATER_MOCCASIN, 'S', BROWN, "water moccasin", M_COLD_BLOOD, MR_RES_POISON, - 300, 10, MONS_SNAKE, MONS_BROWN_SNAKE, MH_NATURAL, -3, + 300, 10, MONS_SNAKE, MONS_WATER_MOCCASIN, MH_NATURAL, -3, { {AT_BITE, AF_POISON_MEDIUM, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 4, 3, 5, 0 }, 2, 15, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, @@ -2583,10 +2583,10 @@ static monsterentry mondata[] = { }, { - MONS_BLACK_SNAKE, 'S', BLUE, "black snake", + MONS_BLACK_MAMBA, 'S', BLUE, "black mamba", M_COLD_BLOOD, MR_RES_POISON, - 500, 12, MONS_SNAKE, MONS_BLACK_SNAKE, MH_NATURAL, -3, + 500, 12, MONS_SNAKE, MONS_BLACK_MAMBA, MH_NATURAL, -3, { {AT_BITE, AF_POISON_MEDIUM, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, 4, 15, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, @@ -2594,10 +2594,10 @@ static monsterentry mondata[] = { }, { - MONS_YELLOW_SNAKE, 'S', YELLOW, "yellow snake", + MONS_VIPER, 'S', YELLOW, "viper", M_COLD_BLOOD, MR_RES_POISON, - 400, 10, MONS_SNAKE, MONS_YELLOW_SNAKE, MH_NATURAL, -3, + 400, 10, MONS_SNAKE, MONS_VIPER, MH_NATURAL, -3, { {AT_BITE, AF_POISON_MEDIUM, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, 4, 14, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, @@ -2948,10 +2948,10 @@ static monsterentry mondata[] = { }, { - MONS_ELECTRICAL_EEL, ';', LIGHTBLUE, "electrical eel", + MONS_ELECTRIC_EEL, ';', LIGHTBLUE, "electric eel", M_COLD_BLOOD | M_SPECIAL_ABILITY, MR_RES_ELEC, - 0, 10, MONS_ELECTRICAL_EEL, MONS_ELECTRICAL_EEL, MH_NATURAL, -3, + 0, 10, MONS_ELECTRIC_EEL, MONS_ELECTRIC_EEL, MH_NATURAL, -3, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, 1, 15, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL, diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index 9759560bde..592a62f99b 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -93,7 +93,7 @@ static int _mons_misc_level(int mcls) case MONS_ANT_LARVA: return 10; - case MONS_ELECTRICAL_EEL: + case MONS_ELECTRIC_EEL: case MONS_LAVA_FISH: case MONS_LAVA_SNAKE: case MONS_LAVA_WORM: @@ -614,7 +614,7 @@ int mons_standard_level(int mcls) case MONS_SCORPION: return 8; - case MONS_BROWN_SNAKE: + case MONS_WATER_MOCCASIN: case MONS_CENTAUR: case MONS_ICE_BEAST: case MONS_IMP: @@ -809,7 +809,7 @@ int mons_standard_level(int mcls) return 33; case MONS_BIG_FISH: - case MONS_ELECTRICAL_EEL: + case MONS_ELECTRIC_EEL: case MONS_GIANT_GOLDFISH: case MONS_JELLYFISH: case MONS_LAVA_FISH: @@ -829,7 +829,7 @@ int mons_standard_rare(int mcls) switch (mcls) { case MONS_BIG_FISH: - case MONS_ELECTRICAL_EEL: + case MONS_ELECTRIC_EEL: case MONS_GIANT_GOLDFISH: case MONS_JELLYFISH: case MONS_LAVA_FISH: @@ -962,7 +962,7 @@ int mons_standard_rare(int mcls) return 32; case MONS_ARMOUR_MIMIC: - case MONS_BROWN_SNAKE: + case MONS_WATER_MOCCASIN: case MONS_DRAGON: case MONS_ETTIN: case MONS_FIRE_VORTEX: @@ -1360,7 +1360,7 @@ int mons_lair_level(int mcls) mlev += 4; break; - case MONS_BROWN_SNAKE: + case MONS_WATER_MOCCASIN: case MONS_BUTTERFLY: case MONS_GIANT_BEETLE: case MONS_GIANT_SLUG: @@ -1386,7 +1386,7 @@ int mons_lair_level(int mcls) mlev += 6; break; - case MONS_BLACK_SNAKE: + case MONS_BLACK_MAMBA: case MONS_BRAIN_WORM: case MONS_BUMBLEBEE: case MONS_FIREDRAKE: @@ -1435,7 +1435,7 @@ int mons_lair_rare(int mcls) case MONS_QUOKKA: return 99; - case MONS_BROWN_SNAKE: + case MONS_WATER_MOCCASIN: case MONS_GIANT_LIZARD: return 90; @@ -1472,7 +1472,7 @@ int mons_lair_rare(int mcls) case MONS_YAK: return 50; - case MONS_BLACK_SNAKE: + case MONS_BLACK_MAMBA: return 47; case MONS_BLINK_FROG: @@ -1577,7 +1577,7 @@ int mons_swamp_level(int mcls) mlev += 2; break; - case MONS_BROWN_SNAKE: + case MONS_WATER_MOCCASIN: case MONS_HUNGRY_GHOST: case MONS_INSUBSTANTIAL_WISP: case MONS_JELLY: @@ -1646,7 +1646,7 @@ int mons_swamp_rare(int mcls) case MONS_INSUBSTANTIAL_WISP: return 43; - case MONS_BROWN_SNAKE: + case MONS_WATER_MOCCASIN: return 33; case MONS_RED_WASP: @@ -1796,9 +1796,9 @@ int mons_pitsnake_level(int mcls) mlev++; break; - case MONS_BROWN_SNAKE: - case MONS_BLACK_SNAKE: - case MONS_YELLOW_SNAKE: + case MONS_WATER_MOCCASIN: + case MONS_BLACK_MAMBA: + case MONS_VIPER: case MONS_GREY_SNAKE: case MONS_NAGA: mlev += 2; @@ -1829,10 +1829,10 @@ int mons_pitsnake_rare(int mcls) switch (mcls) { case MONS_SNAKE: - case MONS_BROWN_SNAKE: + case MONS_WATER_MOCCASIN: return 99; - case MONS_BLACK_SNAKE: + case MONS_BLACK_MAMBA: return 72; case MONS_NAGA: @@ -1842,7 +1842,7 @@ int mons_pitsnake_rare(int mcls) case MONS_NAGA_MAGE: return 34; - case MONS_YELLOW_SNAKE: + case MONS_VIPER: case MONS_GREY_SNAKE: return 32; diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 04aa3a9916..11009cef34 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -3583,7 +3583,7 @@ bool monsters::wants_submerge() const return (_foe == NULL || !can_see(_foe)); } - const bool has_ranged_attack = (type == MONS_ELECTRICAL_EEL + const bool has_ranged_attack = (type == MONS_ELECTRIC_EEL || type == MONS_LAVA_SNAKE || mons_genus(type) == MONS_MERMAID && you.species != SP_MERFOLK); @@ -7372,7 +7372,7 @@ void monsters::apply_enchantment(const mon_enchant &me) const dungeon_feature_type grid = grd(pos()); // Badly injured monsters prefer to stay submerged... - // electrical eels and lava snakes have ranged attacks + // electric eels and lava snakes have ranged attacks // and are more likely to surface. -- bwr if (!monster_can_submerge(this, grid)) del_ench(ENCH_SUBMERGED); // forced to surface @@ -7385,7 +7385,7 @@ void monsters::apply_enchantment(const mon_enchant &me) del_ench(ENCH_SUBMERGED); break; } - else if (((type == MONS_ELECTRICAL_EEL || type == MONS_LAVA_SNAKE) + else if (((type == MONS_ELECTRIC_EEL || type == MONS_LAVA_SNAKE) && (one_chance_in(50) || (mons_near(this) && hit_points == max_hit_points && !one_chance_in(10)))) @@ -8966,7 +8966,7 @@ mon_body_shape get_mon_shape(const int type) case 'Z': // constructed type, not enough info to determine shape return(MON_SHAPE_MISC); case ';': // Fish and eels - if (type == MONS_ELECTRICAL_EEL) + if (type == MONS_ELECTRIC_EEL) return(MON_SHAPE_SNAKE); else return (MON_SHAPE_FISH); diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 310fb9e111..2673369232 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -5588,7 +5588,7 @@ static bool _handle_special_ability(monsters *monster, bolt & beem) } break; - case MONS_ELECTRICAL_EEL: + case MONS_ELECTRIC_EEL: if (monster->has_ench(ENCH_CONFUSION)) break; diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt index 010c2f3187..4473de88cc 100644 --- a/crawl-ref/source/rltiles/dc-corpse.txt +++ b/crawl-ref/source/rltiles/dc-corpse.txt @@ -75,12 +75,12 @@ queen_ant CORPSE_QUEEN_ANT /* Q */ queen_bee CORPSE_QUEEN_BEE /* Q */ %back dc-misc/blood_red dc-misc/blood_red1 dc-misc/blood_red2 dc-misc/blood_red3 dc-misc/blood_red4 -black_snake CORPSE_BLACK_SNAKE /* S */ -brown_snake CORPSE_BROWN_SNAKE /* S */ +black_mamba CORPSE_BLACK_MAMBA /* S */ +water_moccasin CORPSE_WATER_MOCCASIN /* S */ grey_snake CORPSE_GREY_SNAKE /* S */ small_snake CORPSE_SMALL_SNAKE /* S */ snake CORPSE_SNAKE /* S */ -yellow_snake CORPSE_YELLOW_SNAKE /* S */ +viper CORPSE_VIPER /* S */ %sdir dc-mon deep_troll CORPSE_DEEP_TROLL /* T */ diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 54454afc40..a108b66f4c 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -83,7 +83,7 @@ moth_of_wrath MONS_MOTH_OF_WRATH ## Aquatics (';') big_fish MONS_BIG_FISH giant_goldfish MONS_GIANT_GOLDFISH -electrical_eel MONS_ELECTRICAL_EEL +electric_eel MONS_ELECTRIC_EEL lava_fish MONS_LAVA_FISH shark MONS_SHARK jellyfish MONS_JELLYFISH /*'J'*/ @@ -113,11 +113,11 @@ queen_bee MONS_QUEEN_BEE ## Snakes ('S') small_snake MONS_SMALL_SNAKE snake MONS_SNAKE -black_snake MONS_BLACK_SNAKE -brown_snake MONS_BROWN_SNAKE +black_mamba MONS_BLACK_MAMBA +water_moccasin MONS_WATER_MOCCASIN grey_snake MONS_GREY_SNAKE lava_snake MONS_LAVA_SNAKE -yellow_snake MONS_YELLOW_SNAKE +viper MONS_VIPER salamander MONS_SALAMANDER ## Bears ('U') diff --git a/crawl-ref/source/rltiles/dc-mon/animals/black_mamba.png b/crawl-ref/source/rltiles/dc-mon/animals/black_mamba.png new file mode 100644 index 0000000000..74b35a58f3 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/animals/black_mamba.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/black_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/black_snake.png deleted file mode 100644 index 74b35a58f3..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/animals/black_snake.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/brown_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/brown_snake.png deleted file mode 100644 index 5fa893de0f..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/animals/brown_snake.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/electric_eel.png b/crawl-ref/source/rltiles/dc-mon/animals/electric_eel.png new file mode 100644 index 0000000000..c03fb856d7 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/animals/electric_eel.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/electrical_eel.png b/crawl-ref/source/rltiles/dc-mon/animals/electrical_eel.png deleted file mode 100644 index c03fb856d7..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/animals/electrical_eel.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/viper.png b/crawl-ref/source/rltiles/dc-mon/animals/viper.png new file mode 100644 index 0000000000..f7e1710131 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/animals/viper.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/water_moccasin.png b/crawl-ref/source/rltiles/dc-mon/animals/water_moccasin.png new file mode 100644 index 0000000000..5fa893de0f Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/animals/water_moccasin.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/animals/yellow_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/yellow_snake.png deleted file mode 100644 index f7e1710131..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/animals/yellow_snake.png and /dev/null differ diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index b584327c4b..256d0d4af0 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1024,7 +1024,7 @@ bool cast_sticks_to_snakes(int pow, god_type god) if (one_chance_in(5 - std::min(4, div_rand_round(pow * 2, 25))) || get_ammo_brand(wpn) == SPMSL_POISONED) { - mon = x_chance_in_y(pow / 3, 100) ? MONS_BROWN_SNAKE + mon = x_chance_in_y(pow / 3, 100) ? MONS_WATER_MOCCASIN : MONS_SNAKE; } else @@ -1055,7 +1055,7 @@ bool cast_sticks_to_snakes(int pow, god_type god) || wpn.sub_type == WPN_GLAIVE || wpn.sub_type == WPN_BLOWGUN)) { - // Upsizing Snakes to Brown Snakes as the base class for using + // Upsizing Snakes to Water Moccasins as the base class for using // the really big sticks (so bonus applies really only to trolls // and ogres). Still, it's unlikely any character is strong // enough to bother lugging a few of these around. - bwr @@ -1063,16 +1063,16 @@ bool cast_sticks_to_snakes(int pow, god_type god) if (item_mass(wpn) < 300) mon = MONS_SNAKE; else - mon = MONS_BROWN_SNAKE; + mon = MONS_WATER_MOCCASIN; if (pow > 20 && one_chance_in(3)) - mon = MONS_BROWN_SNAKE; + mon = MONS_WATER_MOCCASIN; if (pow > 40 && one_chance_in(3)) - mon = MONS_YELLOW_SNAKE; + mon = MONS_VIPER; if (pow > 70 && one_chance_in(3)) - mon = MONS_BLACK_SNAKE; + mon = MONS_BLACK_MAMBA; if (pow > 90 && one_chance_in(3)) mon = MONS_GREY_SNAKE; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index c4975fafe0..9968f253aa 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -617,12 +617,12 @@ int tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_SMALL_SNAKE; case MONS_SNAKE: return TILEP_MONS_SNAKE; - case MONS_BROWN_SNAKE: - return TILEP_MONS_BROWN_SNAKE; - case MONS_BLACK_SNAKE: - return TILEP_MONS_BLACK_SNAKE; - case MONS_YELLOW_SNAKE: - return TILEP_MONS_YELLOW_SNAKE; + case MONS_WATER_MOCCASIN: + return TILEP_MONS_WATER_MOCCASIN; + case MONS_BLACK_MAMBA: + return TILEP_MONS_BLACK_MAMBA; + case MONS_VIPER: + return TILEP_MONS_VIPER; case MONS_GREY_SNAKE: return TILEP_MONS_GREY_SNAKE; @@ -699,8 +699,8 @@ int tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_BIG_FISH; case MONS_GIANT_GOLDFISH: return TILEP_MONS_GIANT_GOLDFISH; - case MONS_ELECTRICAL_EEL: - return TILEP_MONS_ELECTRICAL_EEL; + case MONS_ELECTRIC_EEL: + return TILEP_MONS_ELECTRIC_EEL; case MONS_SHARK: return TILEP_MONS_SHARK; case MONS_JELLYFISH: @@ -1786,12 +1786,12 @@ static int _tileidx_corpse(int mon) return TILE_CORPSE_SMALL_SNAKE; case MONS_SNAKE: return TILE_CORPSE_SNAKE; - case MONS_BROWN_SNAKE: - return TILE_CORPSE_BROWN_SNAKE; - case MONS_BLACK_SNAKE: - return TILE_CORPSE_BLACK_SNAKE; - case MONS_YELLOW_SNAKE: - return TILE_CORPSE_YELLOW_SNAKE; + case MONS_WATER_MOCCASIN: + return TILE_CORPSE_WATER_MOCCASIN; + case MONS_BLACK_MAMBA: + return TILE_CORPSE_BLACK_MAMBA; + case MONS_VIPER: + return TILE_CORPSE_VIPER; case MONS_GREY_SNAKE: return TILE_CORPSE_GREY_SNAKE; case MONS_TROLL: -- cgit v1.2.3-54-g00ecf