summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/describe.cc2
-rw-r--r--crawl-ref/source/dungeon.cc4
-rw-r--r--crawl-ref/source/enum.h2
-rw-r--r--crawl-ref/source/lua/chnkdata.lua2
-rw-r--r--crawl-ref/source/menu.h2
-rw-r--r--crawl-ref/source/mon-data.h2
-rw-r--r--crawl-ref/source/monspeak.cc12
7 files changed, 13 insertions, 13 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 2fc308c6ca..3d8ba3803f 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -6143,7 +6143,7 @@ void describe_monsters(int class_described, unsigned char which_mons)
description += "A tan, fit and thoroughly evil surfer.";
break;
- case MONS_ADOLF:
+ case MONS_FREDERICK:
description += "A svelte fighter-mage with unfortunate facial hair.";
break;
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 83d69a5086..fe4034931d 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3222,7 +3222,7 @@ static int give_weapon(monsters *mon, int level)
case MONS_HELL_KNIGHT:
case MONS_MAUD:
- case MONS_ADOLF:
+ case MONS_FREDERICK:
case MONS_MARGERY:
{
force_item = true;
@@ -3532,7 +3532,7 @@ void give_armour(monsters *mon, int level)
if (item_race == MAKE_ITEM_RANDOM_RACE)
item_race = MAKE_ITEM_ORCISH;
// deliberate fall through {dlb}
- case MONS_ADOLF:
+ case MONS_FREDERICK:
case MONS_HELL_KNIGHT:
case MONS_LOUISE:
case MONS_MARGERY:
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index a550facf69..3ebb6c03fc 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2122,7 +2122,7 @@ enum monster_type // (int) menv[].type
MONS_DUANE, // 305
MONS_XTAHUA,
MONS_NORRIS,
- MONS_ADOLF,
+ MONS_FREDERICK,
MONS_MARGERY,
MONS_BORIS, // 310
// BCR - end second batch of uniques.
diff --git a/crawl-ref/source/lua/chnkdata.lua b/crawl-ref/source/lua/chnkdata.lua
index 60f098c96b..bfc93be699 100644
--- a/crawl-ref/source/lua/chnkdata.lua
+++ b/crawl-ref/source/lua/chnkdata.lua
@@ -16,7 +16,7 @@
-- and enables auto_eat_chunks in eat.lua.
---------------------------------------------------------------------------
-sc_cont = {"program bug","ettin","goblin","jackal","manticore","orc","ugly thing","two-headed ogre","hobgoblin","ogre","troll","orc warrior","orc wizard","orc knight","minotaur","beast","iron devil","orc sorcerer","","","hell knight","necromancer","wizard","orc priest","orc high priest","human","gnoll","earth elemental","fire elemental","air elemental","Ice Fiend","Shadow Fiend","spectral warrior","pulsating lump","rock troll","stone giant","flayed ghost","insubstantial wisp","vapour","ogre-mage","dancing weapon","elf","war dog","grey rat","giant mosquito","fire giant","frost giant","firedrake","deep troll","giant blowfly","swamp dragon","swamp drake","hill giant","giant cockroach","white imp","lemure","ufetubus","manes","midge","neqoxec","hellwing","smoke demon","ynoxinul","Executioner","Blue Death","Balrug","Cacodemon","demonic crawler","sun demon","shadow imp","shadow wraith","Mnoleg","Lom Lobon","Cerebov","Gloorx Vloq","orc warlord","deep elf soldier","deep elf fighter","deep elf knight","deep elf mage","deep elf summoner","deep elf conjurer","deep elf priest","deep elf high priest","deep elf demonologist","deep elf annihilator","deep elf sorcerer","deep elf death mage","Terence","Jessica","Ijyb","Sigmund","Blork the orc","Edmund","Psyche","Erolcha","Donald","Urug","Michael","Joseph","Snorg","Erica","Josephine","Harold","Norbert","Jozef","Agnes","Maud","Louise","Francis","Frances","Rupert","Wayne","Duane","Xtahua","Norris","Adolf","Margery","Boris","Geryon","Dispater","Asmodeus","Antaeus","Ereshkigal","vault guard","Killer Klown","ball lightning","orb of fire","boggart","quicksilver dragon","iron dragon","skeletal warrior","","&","warg","","","komodo dragon"}
+sc_cont = {"program bug","ettin","goblin","jackal","manticore","orc","ugly thing","two-headed ogre","hobgoblin","ogre","troll","orc warrior","orc wizard","orc knight","minotaur","beast","iron devil","orc sorcerer","","","hell knight","necromancer","wizard","orc priest","orc high priest","human","gnoll","earth elemental","fire elemental","air elemental","Ice Fiend","Shadow Fiend","spectral warrior","pulsating lump","rock troll","stone giant","flayed ghost","insubstantial wisp","vapour","ogre-mage","dancing weapon","elf","war dog","grey rat","giant mosquito","fire giant","frost giant","firedrake","deep troll","giant blowfly","swamp dragon","swamp drake","hill giant","giant cockroach","white imp","lemure","ufetubus","manes","midge","neqoxec","hellwing","smoke demon","ynoxinul","Executioner","Blue Death","Balrug","Cacodemon","demonic crawler","sun demon","shadow imp","shadow wraith","Mnoleg","Lom Lobon","Cerebov","Gloorx Vloq","orc warlord","deep elf soldier","deep elf fighter","deep elf knight","deep elf mage","deep elf summoner","deep elf conjurer","deep elf priest","deep elf high priest","deep elf demonologist","deep elf annihilator","deep elf sorcerer","deep elf death mage","Terence","Jessica","Ijyb","Sigmund","Blork the orc","Edmund","Psyche","Erolcha","Donald","Urug","Michael","Joseph","Snorg","Erica","Josephine","Harold","Norbert","Jozef","Agnes","Maud","Louise","Francis","Frances","Rupert","Wayne","Duane","Xtahua","Norris","Frederick","Margery","Boris","Geryon","Dispater","Asmodeus","Antaeus","Ereshkigal","vault guard","Killer Klown","ball lightning","orb of fire","boggart","quicksilver dragon","iron dragon","skeletal warrior","","&","warg","","","komodo dragon"}
sc_pois = {"killer bee","killer bee larva","quasit","scorpion","yellow wasp","giant beetle","kobold","queen bee","kobold demonologist","big kobold","wolf spider","brain worm","boulder beetle","giant mite","hydra","mottled dragon","brown snake","death yak","bumblebee","redback","spiny worm","golden dragon","elephant slug","green rat","orange rat","black snake","giant centipede","iron troll","naga","yellow snake","red wasp","soldier ant","queen ant","ant larva","spiny frog","orange demon","Green Death","giant amoeba","giant slug","giant snail","boring beetle","naga mage","naga warrior","brown ooze","azure jelly","death ooze","acid blob","ooze","shining eye","greater naga","eye of devastation","gila monster"}
sc_hcl = {"necrophage","ghoul"}
sc_mut = {"guardian naga","eye of draining","giant orange brain","great orb of eyes","glowing shapeshifter","shapeshifter","very ugly thing"}
diff --git a/crawl-ref/source/menu.h b/crawl-ref/source/menu.h
index 55eef14f97..04b1cfa7da 100644
--- a/crawl-ref/source/menu.h
+++ b/crawl-ref/source/menu.h
@@ -108,7 +108,7 @@ struct MenuEntry
return selected_qty > 0 && quantity;
}
- void select( int qty = -1 )
+ virtual void select( int qty = -1 )
{
if (selected())
selected_qty = 0;
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 71d1b4cd81..c4cfbb822c 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -3277,7 +3277,7 @@
,
{
- MONS_ADOLF, '@', DARKGREY, "Adolf",
+ MONS_FREDERICK, '@', DARKGREY, "Frederick",
M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD
| M_SEE_INVIS | M_EVIL | M_UNIQUE,
MR_NO_FLAGS,
diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc
index 47678b005d..6ba349d4b0 100644
--- a/crawl-ref/source/monspeak.cc
+++ b/crawl-ref/source/monspeak.cc
@@ -516,7 +516,7 @@ bool mons_speaks(struct monsters *monster)
case MONS_LOUISE:
case MONS_FRANCES:
case MONS_DUANE:
- case MONS_ADOLF:
+ case MONS_FREDERICK:
switch (random2(17))
{
case 0:
@@ -1115,7 +1115,7 @@ bool mons_speaks(struct monsters *monster)
break;
case 6:
strcat(info,
- " says, \"I'm bad girl. But I can't do anything about it.\"");
+ " says, \"I'm a bad girl. But I can't do anything about it.\"");
break;
case 7:
strcat(info,
@@ -1219,7 +1219,7 @@ bool mons_speaks(struct monsters *monster)
strcat(info, " screams, \"I want to be alone!\"");
break;
case 3:
- strcat(info, " says, \"You are really nuisance.\"");
+ strcat(info, " says, \"You are really a nuisance.\"");
break;
case 4:
strcat(info,
@@ -1589,7 +1589,7 @@ bool mons_speaks(struct monsters *monster)
strcat(info, " ponders the situation.");
break;
case 4:
- strcat(info, " looks for scalpel.");
+ strcat(info, " looks for a scalpel.");
break;
case 5:
@@ -1610,7 +1610,7 @@ bool mons_speaks(struct monsters *monster)
strcat(info, " says, \"I want you in my laboratory!\"");
break;
case 9:
- strcat(info, " says, \"What about little dissection?\"");
+ strcat(info, " says, \"What about a little dissection?\"");
break;
case 10:
strcat(info,
@@ -1723,7 +1723,7 @@ bool mons_speaks(struct monsters *monster)
break;
case 12:
- strcat(info, " says, \"Breath deeply.\"");
+ strcat(info, " says, \"Breathe deeply.\"");
break;
case 13:
strcat(info, " screams, \"Love! Eternal love!\"");
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-23 15:27:50 +0000