summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat/database/insult.txt
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-11 20:18:40 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-11 20:18:40 +0000
commit7f1f52b6d4774fb6cc523ec035dbf4ac4cd4af48 (patch)
treea3dac50cafd840505cbe1a06e2aabc76a3e8b827 /crawl-ref/source/dat/database/insult.txt
parent1daa1c18ab74074b6d4d0bb4b3fb2c4e250516af (diff)
downloadcrawl-ref-7f1f52b6d4774fb6cc523ec035dbf4ac4cd4af48.tar.gz
crawl-ref-7f1f52b6d4774fb6cc523ec035dbf4ac4cd4af48.zip
Another of those commits on monster speech, hopefully the last one for
some time, though. I added a new prefix "related" if the player character has the same genus as the monster. My new prefix additions (hostile, related and religion) can now be skipped in the speech lookup, which fixes a couple of problems where several monsters were forced silent because of lookup problems. Also clean up the lookup process for silence, allow charmed monsters to sometimes speak (if rarely) and added several debugging statements that are also mentioned in monster_speech.txt that is now clearer than ever before (I hope). Fixed a couple of bugs in the monster shape calculation where the old glyphs were still being used. Also, a Draconian character eating any type of Draconian will now count as cannibalism. Also: FR 1894060: Level annotations now prompt for confirmation if they contain an exclamation mark (rather than "WARN"). Fix 1859443: Arriving on a square via staircase now calls request_autopickup and will describe items on the square. Oh, and fix init.txt to really allow reading in macros from external files. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3604 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat/database/insult.txt')
-rw-r--r--crawl-ref/source/dat/database/insult.txt229
1 files changed, 112 insertions, 117 deletions
diff --git a/crawl-ref/source/dat/database/insult.txt b/crawl-ref/source/dat/database/insult.txt
index 11be0548eb..c68281146e 100644
--- a/crawl-ref/source/dat/database/insult.txt
+++ b/crawl-ref/source/dat/database/insult.txt
@@ -45,123 +45,6 @@ Thy @body_or_spiritual_part@ shall be my @meal@!
I @will_or_shall@ @feast_or_devour@ thy @body_or_spiritual_part@!
-# Not currently used:
-#Thou @generic_insult@!
-
-%%%%
-body_or_spiritual_part
-
-w:3
-@important_body_part@
-
-w:1
-@important_spiritual_part@
-
-%%%%
-will_or_shall
-
-will
-
-shall
-
-%%%%
-feast_or_devour
-
-feast on
-
-devour
-
-%%%%
-#######################################################
-# generic insults consists of three random parts
-#######################################################
-generic_insult
-
-@insult_adjective1@ @insult_adjective2@ @insult_noun@
-
-%%%%
-
-important_body_part
-
-head
-
-brain
-
-heart
-
-viscera
-
-eyes
-
-lungs
-
-liver
-
-throat
-
-neck
-
-skull
-
-spine
-%%%%
-
-important_spiritual_part
-
-soul
-
-spirit
-
-inner light
-
-hope
-
-faith
-
-will
-
-heart
-
-mind
-
-sanity
-
-fortitude
-
-life force
-%%%%
-
-meal
-
-meal
-
-breakfast
-
-lunch
-
-dinner
-
-supper
-
-repast
-
-snack
-
-victuals
-
-refection
-
-junket
-
-luncheon
-
-snackling
-
-curdle
-
-snacklet
-
-mouthful
%%%%
# capitalized "flee" verbs
run_away
@@ -304,6 +187,118 @@ whilst thou art whole
whilst life thou hast
%%%%
+body_or_spiritual_part
+
+w:3
+@important_body_part@
+
+w:1
+@important_spiritual_part@
+
+%%%%
+will_or_shall
+
+will
+
+shall
+
+%%%%
+feast_or_devour
+
+feast on
+
+devour
+
+%%%%
+important_body_part
+
+head
+
+brain
+
+heart
+
+viscera
+
+eyes
+
+lungs
+
+liver
+
+throat
+
+neck
+
+skull
+
+spine
+
+%%%%
+important_spiritual_part
+
+soul
+
+spirit
+
+inner light
+
+hope
+
+faith
+
+will
+
+heart
+
+mind
+
+sanity
+
+fortitude
+
+life force
+%%%%
+
+meal
+
+meal
+
+breakfast
+
+lunch
+
+dinner
+
+supper
+
+repast
+
+snack
+
+victuals
+
+refection
+
+junket
+
+luncheon
+
+snackling
+
+curdle
+
+snacklet
+
+mouthful
+%%%%
+#######################################################
+# generic insults consist of three random parts
+#######################################################
+generic_insult
+
+@insult_adjective1@ @insult_adjective2@ @insult_noun@
+%%%%
###############################################################
# adjective1, usually short and/or consisting of one word only
###############################################################