summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/dat/database/miscname.txt157
-rw-r--r--crawl-ref/source/dat/database/rand_all.txt63
-rw-r--r--crawl-ref/source/database.cc2
-rw-r--r--crawl-ref/source/effects.cc6
-rw-r--r--crawl-ref/source/misc.cc67
-rw-r--r--crawl-ref/source/misc.h2
-rw-r--r--crawl-ref/source/mstuff2.cc2
7 files changed, 168 insertions, 131 deletions
diff --git a/crawl-ref/source/dat/database/miscname.txt b/crawl-ref/source/dat/database/miscname.txt
new file mode 100644
index 0000000000..88bfe62359
--- /dev/null
+++ b/crawl-ref/source/dat/database/miscname.txt
@@ -0,0 +1,157 @@
+######################################################
+# Miscellaneous
+# -------------
+# miscname.txt: lookup miscellaneous names
+#
+# This file contains a list of names for miscellaneous things.
+# This is currently only used for colours and writing types.
+#
+# Note that randarts may use these as well.
+######################################################
+%%%%
+glowing_adj
+
+Brilliant
+
+Pale
+
+Mottled
+
+Shimmering
+
+Bright
+
+Dark
+
+Shining
+
+Faint
+
+%%%%
+colour_name
+
+Aubergine
+
+Azure
+
+Beige
+
+Black
+
+Blue
+
+Bronze
+
+Brown
+
+Charcoal
+
+Chartreuse
+
+Cyan
+
+Gold
+
+Green
+
+Grey
+
+Indigo
+
+Leaf Green
+
+Lime Green
+
+Magenta
+
+Marigold
+
+Mauve
+
+Ochre
+
+Orange
+
+Pink
+
+Purple
+
+Red
+
+Rubric
+
+Scarlet
+
+Silver
+
+Umber
+
+White
+
+Yellow
+
+%%%%
+glowing_colour_name
+
+@glowing_adj@ @colour_name@
+
+%%%%
+writing_adj
+
+Writhing
+
+Bold
+
+Faint
+
+Spidery
+
+Blocky
+
+Angular
+
+Shimmering
+
+Glowing
+
+Pulsating
+
+Sinuous
+
+%%%%
+writing_noun
+
+Writing
+
+Scrawl
+
+Sigils
+
+Runes
+
+Hieroglyphics
+
+Figures
+
+Print-Out
+
+Binary Code
+
+Glyphs
+
+Symbols
+
+Text
+
+%%%%
+writing_name
+
+@writing_adj@ @writing_noun@
+
+@colour_name@ @writing_noun@
+
+@glowing_colour_name@ @writing_noun@
+
+@writing_adj@ @colour_name@ @writing_noun@
+
+%%%%
diff --git a/crawl-ref/source/dat/database/rand_all.txt b/crawl-ref/source/dat/database/rand_all.txt
index 19df759b83..2264a11dce 100644
--- a/crawl-ref/source/dat/database/rand_all.txt
+++ b/crawl-ref/source/dat/database/rand_all.txt
@@ -187,69 +187,6 @@ Eternal Night
Eternity
%%%%
-colour_name
-
-Aubergine
-
-Azure
-
-Beige
-
-Black
-
-Blue
-
-Bronze
-
-Brown
-
-Charcoal
-
-Chartreuse
-
-Cyan
-
-Gold
-
-Green
-
-Grey
-
-Indigo
-
-Leaf Green
-
-Lime Green
-
-Magenta
-
-Marigold
-
-Mauve
-
-Ochre
-
-Orange
-
-Pink
-
-Purple
-
-Red
-
-Rubric
-
-Scarlet
-
-Silver
-
-Umber
-
-White
-
-Yellow
-
-%%%%
sky_or_light
the Sun
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc
index c1350cb2b4..6b7f0cf4b7 100644
--- a/crawl-ref/source/database.cc
+++ b/crawl-ref/source/database.cc
@@ -74,6 +74,8 @@ static TextDB AllDBs[] =
"database/rand_all.txt", // jewellery and general
// This doesn't really belong here, but they *are* god gifts...
"database/monname.txt", // orcish names for Beogh to choose from
+ // This doesn't really belong here, but *can* be used by randarts...
+ "database/miscname.txt", // names for miscellaneous things
NULL),
TextDB( "db/speak",
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index e8ef2d8705..344702c037 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -736,8 +736,8 @@ void random_uselessness(unsigned char ru, unsigned char sc_read_2)
switch (ru)
{
case 0:
- msg::stream << "The dust glows a " << weird_glow_colour()
- << " colour!" << std::endl;
+ msg::stream << "The dust glows " << weird_glowing_colour()
+ << "!" << std::endl;
break;
case 1:
@@ -749,7 +749,7 @@ void random_uselessness(unsigned char ru, unsigned char sc_read_2)
if (you.equip[EQ_WEAPON] != -1)
{
msg::stream << you.inv[you.equip[EQ_WEAPON]].name(DESC_CAP_YOUR)
- << " glows " << weird_glow_colour()
+ << " glows " << weird_glowing_colour()
<< " for a moment." << std::endl;
}
else
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 4f319c0721..0d098adaed 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2374,9 +2374,9 @@ void new_level(void)
#endif
}
-static std::string weird_colour()
+std::string weird_glowing_colour()
{
- std::string result = getRandNameString("colour_name");
+ std::string result = getRandNameString("glowing_colour_name");
lowercase(result);
@@ -2385,44 +2385,9 @@ static std::string weird_colour()
std::string weird_writing()
{
- int temp_rand; // for probability determinations {dlb}
- std::string result;
+ std::string result = getRandNameString("writing_name");
- temp_rand = random2(14);
- result =
- (temp_rand == 0) ? "writhing" :
- (temp_rand == 1) ? "bold" :
- (temp_rand == 2) ? "faint" :
- (temp_rand == 3) ? "spidery" :
- (temp_rand == 4) ? "blocky" :
- (temp_rand == 5) ? "angular" :
- (temp_rand == 6) ? "shimmering" :
- (temp_rand == 7) ? "glowing" :
- (temp_rand == 8) ? "pulsating" :
- (temp_rand == 9) ? "sinuous"
- : "";
-
- if (!result.empty())
- result += ' ';
-
- result += weird_colour();
-
- result += ' ';
-
- temp_rand = random2(14);
-
- result +=
- (temp_rand == 0) ? "writing" :
- (temp_rand == 1) ? "scrawl" :
- (temp_rand == 2) ? "sigils" :
- (temp_rand == 3) ? "runes" :
- (temp_rand == 4) ? "hieroglyphics" :
- (temp_rand == 5) ? "figures" :
- (temp_rand == 6) ? "print-out" :
- (temp_rand == 7) ? "binary code" :
- (temp_rand == 8) ? "glyphs" :
- (temp_rand == 9) ? "symbols"
- : "text";
+ lowercase(result);
return result;
}
@@ -2439,30 +2404,6 @@ bool scramble(void)
return true;
} // end scramble()
-std::string weird_glow_colour()
-{
- int temp_rand; // for probability determinations {dlb}
- std::string result;
-
- // Must start with a consonant!
- temp_rand = random2(8);
- result =
- (temp_rand == 0) ? "brilliant" :
- (temp_rand == 1) ? "pale" :
- (temp_rand == 2) ? "mottled" :
- (temp_rand == 3) ? "shimmering" :
- (temp_rand == 4) ? "bright" :
- (temp_rand == 5) ? "dark" :
- (temp_rand == 6) ? "shining"
- : "faint";
-
- result += ' ';
-
- result += weird_colour();
-
- return result;
-}
-
bool go_berserk(bool intentional)
{
if (!you.can_go_berserk(intentional))
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h
index b268f0fedd..a5a09d2306 100644
--- a/crawl-ref/source/misc.h
+++ b/crawl-ref/source/misc.h
@@ -96,7 +96,7 @@ void up_stairs(dungeon_feature_type force_stair = DNGN_UNSEEN,
/* ***********************************************************************
* called from: acr - effects
* *********************************************************************** */
-std::string weird_glow_colour();
+std::string weird_glowing_colour();
// last updated 12may2000 {dlb}
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index af6b149e34..c13743b4ba 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -2308,7 +2308,7 @@ bool silver_statue_effects(monsters *mons)
if ((mons_player_visible(mons) || one_chance_in(3)) && !one_chance_in(3))
{
const std::string msg =
- "'s eyes glow " + weird_glow_colour() + '.';
+ "'s eyes glow " + weird_glowing_colour() + '.';
simple_monster_message(mons, msg.c_str(), MSGCH_WARN);
create_monster(
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-13 20:19:49 +0000