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

9 files changed, 26 insertions, 26 deletions

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