diff options
-rw-r--r-- | crawl-ref/source/dat/descript/monsters.txt | 6 | ||||
-rw-r--r-- | crawl-ref/source/dat/lair.des | 2 | ||||
-rw-r--r-- | crawl-ref/source/dat/mini.des | 2 | ||||
-rw-r--r-- | crawl-ref/source/enum.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/mon-data.h | 4 | ||||
-rw-r--r-- | crawl-ref/source/mon-pick.cc | 12 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-corpse.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon.txt | 2 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-mon/animals/giant_toad.png (renamed from crawl-ref/source/rltiles/dc-mon/animals/giant_brown_frog.png) | bin | 828 -> 828 bytes | |||
-rw-r--r-- | crawl-ref/source/spells4.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/tilepick.cc | 8 |
11 files changed, 21 insertions, 21 deletions
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index 618a85040a..540ea21b1b 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -685,9 +685,9 @@ giant blowfly A huge and irritating fly. %%%% -giant brown frog +giant toad -A very large and vicious-looking carnivorous frog. Its knobbly brown skin blends in with the rough rock of your surroundings. +A very large and vicious-looking carnivorous toad. Its knobbly brown skin blends in with the rough rock of your surroundings. %%%% giant centipede @@ -1355,7 +1355,7 @@ A large creature with a human head, the body of a lion, and the wings of a huge %%%% spiny frog -Although slightly smaller than its cousin, the giant brown frog, the spiny frog makes up for lack of size by being covered in wickedly barbed spines and spurs. +Although slightly smaller than the giant toad, the spiny frog makes up for lack of size by being covered in wickedly barbed spines and spurs. %%%% spiny worm diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des index 78d658bb87..3b921d8780 100644 --- a/crawl-ref/source/dat/lair.des +++ b/crawl-ref/source/dat/lair.des @@ -67,7 +67,7 @@ MONS: w:100 nothing / w:40 yak / sheep / death yak MONS: w:100 nothing / w:20 giant iguana / w:20 giant lizard /\ gila monster / komodo dragon MONS: green rat / grey rat / orange rat / quokka / rat -MONS: w:90 nothing / w:30 giant frog / blink frog / giant brown frog /\ +MONS: w:90 nothing / w:30 giant frog / blink frog / giant toad /\ spiny frog SHUFFLE: 12345 MAP diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des index 1de16335d9..9f93e93655 100644 --- a/crawl-ref/source/dat/mini.des +++ b/crawl-ref/source/dat/mini.des @@ -1508,7 +1508,7 @@ ENDMAP NAME: pond DEPTH: D:8-27, Lair MONS: plant w:30 / fungus -MONS: giant frog w:30 / giant brown frog / snake / rat / green rat / swamp drake w:2 +MONS: giant frog w:30 / giant toad / snake / rat / green rat / swamp drake w:2 MONS: giant mosquito SUBST: ! : w. SUBST: 2 : 23 diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 291c0bf43a..fccb77c580 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1849,7 +1849,7 @@ enum monster_type // (int) menv[].type MONS_QUEEN_ANT, MONS_ANT_LARVA, MONS_GIANT_FROG, - MONS_GIANT_BROWN_FROG, + MONS_GIANT_TOAD, MONS_SPINY_FROG, // 180 MONS_BLINK_FROG, MONS_GIANT_COCKROACH, diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 830ee12274..dca94a92b9 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -2014,10 +2014,10 @@ static monsterentry mondata[] = { }, { - MONS_GIANT_BROWN_FROG, 'F', BROWN, "giant brown frog", + MONS_GIANT_TOAD, 'F', BROWN, "giant toad", M_COLD_BLOOD, MR_NO_FLAGS, - 890, 10, MONS_GIANT_FROG, MONS_GIANT_BROWN_FROG, MH_NATURAL, -3, + 890, 10, MONS_GIANT_FROG, MONS_GIANT_TOAD, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 8, 3, 5, 0 }, 2, 11, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_CROAK, I_ANIMAL, diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index 120f4f16d2..394dfe4c3a 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -648,7 +648,7 @@ int mons_standard_level(int mcls) return 12; case MONS_BIG_KOBOLD: - case MONS_GIANT_BROWN_FROG: + case MONS_GIANT_TOAD: case MONS_GIANT_CENTIPEDE: case MONS_OKLOB_PLANT: case MONS_TROLL: @@ -871,7 +871,7 @@ int mons_standard_rare(int mcls) case MONS_CENTAUR: case MONS_CYCLOPS: - case MONS_GIANT_BROWN_FROG: + case MONS_GIANT_TOAD: case MONS_HELLION: case MONS_HOUND: case MONS_OGRE: @@ -1343,7 +1343,7 @@ int mons_lair_level(int mcls) break; case MONS_FUNGUS: - case MONS_GIANT_BROWN_FROG: + case MONS_GIANT_TOAD: case MONS_GIANT_LIZARD: case MONS_GIANT_MITE: case MONS_GREEN_RAT: @@ -1421,7 +1421,7 @@ int mons_lair_rare(int mcls) return 200; case MONS_GIANT_BAT: - case MONS_GIANT_BROWN_FROG: + case MONS_GIANT_TOAD: case MONS_GIANT_FROG: case MONS_GREY_RAT: case MONS_QUOKKA: @@ -1556,7 +1556,7 @@ int mons_swamp_level(int mcls) mlev++; break; - case MONS_GIANT_BROWN_FROG: + case MONS_GIANT_TOAD: case MONS_FUNGUS: case MONS_NECROPHAGE: case MONS_PLANT: @@ -1617,7 +1617,7 @@ int mons_swamp_rare(int mcls) case MONS_FUNGUS: return 99; - case MONS_GIANT_BROWN_FROG: + case MONS_GIANT_TOAD: return 90; case MONS_SWAMP_DRAKE: diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt index 106daf34d0..231fa4f68c 100644 --- a/crawl-ref/source/rltiles/dc-corpse.txt +++ b/crawl-ref/source/rltiles/dc-corpse.txt @@ -91,7 +91,7 @@ boulder_beetle CORPSE_BOULDER_BEETLE ## Frogs ('F') %back dc-misc/blood_red dc-misc/blood_red1 dc-misc/blood_red2 dc-misc/blood_red3 dc-misc/blood_red4 giant_frog CORPSE_GIANT_FROG -giant_brown_frog CORPSE_GIANT_BROWN_FROG +giant_toad CORPSE_GIANT_TOAD blink_frog CORPSE_BLINK_FROG spiny_frog CORPSE_SPINY_FROG diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index db6e461449..a7766ec1e6 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -113,7 +113,7 @@ prince_ribbit MONS_PRINCE_RIBBIT %rim 1 %sdir dc-mon/animals giant_frog MONS_GIANT_FROG -giant_brown_frog MONS_GIANT_BROWN_FROG +giant_toad MONS_GIANT_TOAD %rim 0 blink_frog MONS_BLINK_FROG %rim 1 diff --git a/crawl-ref/source/rltiles/dc-mon/animals/giant_brown_frog.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_toad.png Binary files differindex 9158d537f0..9158d537f0 100644 --- a/crawl-ref/source/rltiles/dc-mon/animals/giant_brown_frog.png +++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_toad.png diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index b3180963a7..2bf09e4eb8 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -428,7 +428,7 @@ static bool _is_domesticated_animal(int type) MONS_YAK, MONS_WYVERN, MONS_HIPPOGRIFF, MONS_GRIFFON, MONS_DEATH_YAK, MONS_WAR_DOG, MONS_GREY_RAT, MONS_GREEN_RAT, MONS_ORANGE_RAT, MONS_SHEEP, - MONS_HOG, MONS_GIANT_FROG, MONS_GIANT_BROWN_FROG, + MONS_HOG, MONS_GIANT_FROG, MONS_GIANT_TOAD, MONS_SPINY_FROG, MONS_BLINK_FROG, MONS_WOLF, MONS_WARG, MONS_BEAR, MONS_GRIZZLY_BEAR, MONS_POLAR_BEAR, MONS_BLACK_BEAR }; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index c714de0c30..2877e85f33 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -499,8 +499,8 @@ int tileidx_monster_base(const monsters *mon, bool detected) // frogs ('F') case MONS_GIANT_FROG: return TILEP_MONS_GIANT_FROG; - case MONS_GIANT_BROWN_FROG: - return TILEP_MONS_GIANT_BROWN_FROG; + case MONS_GIANT_TOAD: + return TILEP_MONS_GIANT_TOAD; case MONS_SPINY_FROG: return TILEP_MONS_SPINY_FROG; case MONS_BLINK_FROG: @@ -1817,8 +1817,8 @@ static int _tileidx_corpse(int mon) // frogs ('F') case MONS_GIANT_FROG: return TILE_CORPSE_GIANT_FROG; - case MONS_GIANT_BROWN_FROG: - return TILE_CORPSE_GIANT_BROWN_FROG; + case MONS_GIANT_TOAD: + return TILE_CORPSE_GIANT_TOAD; case MONS_SPINY_FROG: return TILE_CORPSE_SPINY_FROG; case MONS_BLINK_FROG: |