summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/dat/descript/monsters.txt2
-rw-r--r--crawl-ref/source/dat/entry.des2
-rw-r--r--crawl-ref/source/dat/float.des2
-rw-r--r--crawl-ref/source/dat/hive.des4
-rw-r--r--crawl-ref/source/dat/lair.des8
-rw-r--r--crawl-ref/source/dat/large.des4
-rw-r--r--crawl-ref/source/dat/mini.des2
-rw-r--r--crawl-ref/source/dat/volcano.des10
-rw-r--r--crawl-ref/source/enum.h2
-rw-r--r--crawl-ref/source/mon-abil.cc2
-rw-r--r--crawl-ref/source/mon-data.h4
-rw-r--r--crawl-ref/source/mon-pick.cc4
-rw-r--r--crawl-ref/source/mon-place.cc2
-rw-r--r--crawl-ref/source/rltiles/dc-corpse.txt2
-rw-r--r--crawl-ref/source/rltiles/dc-mon.txt2
-rw-r--r--crawl-ref/source/rltiles/dc-mon/fire_drake.png (renamed from crawl-ref/source/rltiles/dc-mon/firedrake.png)bin503 -> 503 bytes
-rw-r--r--crawl-ref/source/tilepick.cc8
17 files changed, 30 insertions, 30 deletions
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 9736454c10..94b68dec75 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -676,7 +676,7 @@ fire vortex
A swirling cloud of flame.
%%%%
-firedrake
+fire drake
A small dragon, puffing clouds of smoke.
%%%%
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index ee22731e97..f80752713e 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -4491,7 +4491,7 @@ MONS: hog / jackal / wolf / hound / war dog
MONS: giant cockroach / giant ant / butterfly / killer bee / bumblebee /\
redback / giant mite
MONS: swamp worm / lindwurm / worm / spiny worm
-MONS: swamp drake / hydra / wyvern / firedrake
+MONS: swamp drake / hydra / wyvern / fire drake
MONS: bear / polar bear / grizzly bear / black bear
MONS: black mamba / water moccasin / grey snake / salamander / viper
MAP
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 41cf10d0a4..7941996a09 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -565,7 +565,7 @@ NAME: reptile_caves
DEPTH: D:10-13, Lair, Snake
ORIENT: float
MONS: giant gecko / giant newt, giant lizard, giant iguana
-MONS: firedrake / swamp drake
+MONS: fire drake / swamp drake
MONS: snake, water moccasin, viper
SUBST: 4 = 34
SUBST: 3 = 3:20 2
diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des
index dea4ab62ae..be143f3927 100644
--- a/crawl-ref/source/dat/hive.des
+++ b/crawl-ref/source/dat/hive.des
@@ -147,10 +147,10 @@ ENDMAP
NAME: erik_hive_3
TAGS: hive_entry
MONS: killer bee larva, killer bee, queen bee
-MONS: firedrake / w:5 nothing
+MONS: fire drake / w:5 nothing
SHUFFLE: UVTXYZ, lL4/lL4/lL4/wW5
SUBST: l=.l, L=l, w=.w, W=w, U==, V=a, T=a, X=a, Y=a, Z=a, '=.a
-KMONS: l = firedrake / w:200 nothing
+KMONS: l = fire drake / w:200 nothing
KFEAT: l = l
ORIENT: float
MAP
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 3640e02d51..7df50e3f6d 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -41,7 +41,7 @@ ENDMAP
#
NAME: david_lair_2
TAGS: lair_entry
-MONS: plant, firedrake
+MONS: plant, fire drake
SUBST: ' = 1.
ORIENT: float
MAP
@@ -546,10 +546,10 @@ DEPTH: Lair:4-8
TAGS: no_monster_gen mini_float
: if you.absdepth() >= 18 then
MONS: dragon
-MONS: firedrake / w:2 mottled dragon / w:4 nothing
+MONS: fire drake / w:2 mottled dragon / w:4 nothing
: else
MONS: mottled dragon / steam dragon
-MONS: firedrake / w:15 nothing
+MONS: fire drake / w:15 nothing
: end
ITEM: any good_item
SUBST: ! = $:3 d:2
@@ -1055,7 +1055,7 @@ NAME: swamp_alternative
PLACE: Swamp:5
TAGS: no_pool_fixup no_rotate
ORIENT: float
-MONS: swamp dragon, swamp drake, hydra, firedrake
+MONS: swamp dragon, swamp drake, hydra, fire drake
ITEM: nothing
SUBST: 1=1., 2=2., 3=3., 4=4., L=l.
SHUFFLE: Od, 123, lw
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index bd2c946166..7106d7313a 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -1150,8 +1150,8 @@ ORIENT: southeast
TAGS: no_monster_gen
DEPTH: D:20-26
MONS: golden dragon, any draconian, fungus, plant, oklob plant
-KMONS: 6 = firedrake / swamp drake / lindwurm
-KMONS: D = firedrake w:5 / swamp drake w:5 / death drake / lindwurm w:5
+KMONS: 6 = fire drake / swamp drake / lindwurm
+KMONS: D = fire drake w:5 / swamp drake w:5 / death drake / lindwurm w:5
KITEM: D = $
SUBST: $ = $|
SUBST: f : A B
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index b924b83143..2ec4e72464 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -2213,7 +2213,7 @@ ITEM: nothing
SUBST: * = |**...
SUBST: * : *$
SUBST: L = ll.
-MONS: molten gargoyle / firedrake / lindwurm / nothing w:20
+MONS: molten gargoyle / fire drake / lindwurm / nothing w:20
MARKER: d = lua:fog_machine { cloud_type = "flame", \
pow_min = 10, pow_max = 10, delay = 10, \
size = 1, walk_dist = 0, spread_rate= 0 }
diff --git a/crawl-ref/source/dat/volcano.des b/crawl-ref/source/dat/volcano.des
index 4fd83eddd3..b95de9f832 100644
--- a/crawl-ref/source/dat/volcano.des
+++ b/crawl-ref/source/dat/volcano.des
@@ -134,7 +134,7 @@ function volcano_setup (e, metal)
e.lfloortile("floor_rough_red")
end
e.set_random_mon_list([[hog / fire elemental / fire vortex / giant ant /
- bumblebee / firedrake / lindwurm / imp / redback /
+ bumblebee / fire drake / lindwurm / imp / redback /
manticore / hell hound / hell hog / ghoul /
flayed ghost / pulsating lump / toenail golem /
efreet / vampire]])
@@ -274,7 +274,7 @@ end
-- nothing, minotuar (all on its lonesome)
--
-- Natural "packs" usually consist of a few fire/red-themed monsters
--- surrounding either a lindwurm, firedrake, or manticore.
+-- surrounding either a lindwurm, fire drake, or manticore.
--
-- Demonic "packs" usually consist high chance of imps, toenail golems
-- and pulsating lumps, lower chance of red devils, hell hounds and ghouls
@@ -370,7 +370,7 @@ function fiery_guardians (e)
if crawl.one_chance_in(3) then
-- "Lair"-esque fire-themed monster pack.
e.mons("hog / giant ant / redback w:1 / bumblebee w:1 / manticore")
- e.mons("firedrake / lindwurm w:1")
+ e.mons("fire drake / lindwurm w:1")
return
end
@@ -464,7 +464,7 @@ ENDMAP
NAME: enter_volcano_3
TAGS: uniq_volcano
ORIENT: float
-MONS: patrolling firedrake
+MONS: patrolling fire drake
# His name is Robby.
COLOUR: X = red
COLOUR: S = red
@@ -716,7 +716,7 @@ KMONS: u = flying skull
# We have a specific monster set for this vault.
MONS: mummy
MONS: menkaure / guardian mummy
-MONS: firedrake skeleton w:5 / lindwurm skeleton w:1 / hog skeleton / hound skeleton
+MONS: fire drake skeleton w:5 / lindwurm skeleton w:1 / hog skeleton / hound skeleton
MONS: mummy
# Loot: 4 gold, 8 items.
SHUFFLE: 12K
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index e080bbd3c2..0d3f71f50f 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1778,7 +1778,7 @@ enum monster_type // (int) menv[].type
MONS_NAGA,
MONS_FIRE_GIANT,
MONS_FROST_GIANT,
- MONS_FIREDRAKE,
+ MONS_FIRE_DRAKE,
MONS_SHADOW_DRAGON, // 165
MONS_VIPER,
MONS_GREY_SNAKE,
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 65a73da307..ade5feba1f 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -1119,7 +1119,7 @@ bool mon_special_ability(monsters *monster, bolt & beem)
case MONS_DRAGON:
case MONS_HELL_HOUND:
case MONS_LINDWURM:
- case MONS_FIREDRAKE:
+ case MONS_FIRE_DRAKE:
case MONS_XTAHUA:
if (spell == SPELL_NO_SPELL)
spell = SPELL_FIRE_BREATH;
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 4d74d639df..dacc7471a3 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1034,10 +1034,10 @@ static monsterentry mondata[] = {
},
{
- MONS_FIREDRAKE, 'l', RED, "firedrake",
+ MONS_FIRE_DRAKE, 'l', RED, "fire drake",
M_SPECIAL_ABILITY | M_WARM_BLOOD,
MR_RES_FIRE,
- 900, 10, MONS_DRAGON, MONS_FIREDRAKE, MH_NATURAL, -3,
+ 900, 10, MONS_DRAGON, MONS_FIRE_DRAKE, MH_NATURAL, -3,
{ {AT_BITE, AF_PLAIN, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 6, 3, 5, 0 },
3, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT,
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc
index 0e9498648a..022bb53a89 100644
--- a/crawl-ref/source/mon-pick.cc
+++ b/crawl-ref/source/mon-pick.cc
@@ -1386,7 +1386,7 @@ int mons_lair_level(int mcls)
case MONS_BLACK_MAMBA:
case MONS_BRAIN_WORM:
case MONS_BUMBLEBEE:
- case MONS_FIREDRAKE:
+ case MONS_FIRE_DRAKE:
case MONS_HYDRA:
case MONS_OKLOB_PLANT:
case MONS_WYVERN:
@@ -1476,7 +1476,7 @@ int mons_lair_rare(int mcls)
return 45;
case MONS_SHEEP:
- case MONS_FIREDRAKE:
+ case MONS_FIRE_DRAKE:
return 36;
case MONS_WAR_DOG:
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index bfe28f2f81..bbb7799365 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -2972,7 +2972,7 @@ monster_type summon_any_dragon(dragon_class_type dct)
temp_rand = random2(100);
mon = ((temp_rand > 80) ? MONS_SWAMP_DRAKE :
(temp_rand > 59) ? MONS_KOMODO_DRAGON :
- (temp_rand > 34) ? MONS_FIREDRAKE :
+ (temp_rand > 34) ? MONS_FIRE_DRAKE :
(temp_rand > 11) ? MONS_DEATH_DRAKE :
MONS_DRAGON);
break;
diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt
index 4d021669ee..cf1f9b68dc 100644
--- a/crawl-ref/source/rltiles/dc-corpse.txt
+++ b/crawl-ref/source/rltiles/dc-corpse.txt
@@ -180,7 +180,7 @@ titan CORPSE_TITAN
## Drakes ('l')
swamp_drake CORPSE_SWAMP_DRAKE
-firedrake CORPSE_FIREDRAKE
+fire_drake CORPSE_FIRE_DRAKE
lindwurm CORPSE_LINDWURM
death_drake CORPSE_DEATH_DRAKE
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 80b51a8df2..465a96e3d7 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -346,7 +346,7 @@ titan MONS_TITAN
## Drakes (also 'l')
swamp_drake MONS_SWAMP_DRAKE
-firedrake MONS_FIREDRAKE
+fire_drake MONS_FIRE_DRAKE
lindwurm MONS_LINDWURM
death_drake MONS_DEATH_DRAKE
diff --git a/crawl-ref/source/rltiles/dc-mon/firedrake.png b/crawl-ref/source/rltiles/dc-mon/fire_drake.png
index e92b4b6003..e92b4b6003 100644
--- a/crawl-ref/source/rltiles/dc-mon/firedrake.png
+++ b/crawl-ref/source/rltiles/dc-mon/fire_drake.png
Binary files differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 0d40354652..7fe6cda6cb 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -261,8 +261,8 @@ int tileidx_monster_base(const monsters *mon, bool detected)
// drakes (also 'l', but dragon type)
case MONS_SWAMP_DRAKE:
return TILEP_MONS_SWAMP_DRAKE;
- case MONS_FIREDRAKE:
- return TILEP_MONS_FIREDRAKE;
+ case MONS_FIRE_DRAKE:
+ return TILEP_MONS_FIRE_DRAKE;
case MONS_LINDWURM:
return TILEP_MONS_LINDWURM;
case MONS_DEATH_DRAKE:
@@ -1674,8 +1674,8 @@ static int _tileidx_corpse(const item_def &item)
// drakes (also 'l')
case MONS_SWAMP_DRAKE:
return TILE_CORPSE_SWAMP_DRAKE;
- case MONS_FIREDRAKE:
- return TILE_CORPSE_FIREDRAKE;
+ case MONS_FIRE_DRAKE:
+ return TILE_CORPSE_FIRE_DRAKE;
case MONS_LINDWURM:
return TILE_CORPSE_LINDWURM;
case MONS_DEATH_DRAKE:
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-17 08:28:26 +0000