summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-12 22:12:34 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-12 22:12:34 +0000
commit49f1fcf1259b1376b71850fffbb28b2a57bd7901 (patch)
tree7fc90e24e14e32f08cf82e76f6bff22138418471 /crawl-ref/source/dat
parent82bcfc5f239dd1161e2c1882a2fb7dff0103bb21 (diff)
downloadcrawl-ref-49f1fcf1259b1376b71850fffbb28b2a57bd7901.tar.gz
crawl-ref-49f1fcf1259b1376b71850fffbb28b2a57bd7901.zip
Apply trunk r6421 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6522 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat')
-rw-r--r--crawl-ref/source/dat/database/rand_wpn.txt10
-rw-r--r--crawl-ref/source/dat/descript/ability.txt4
-rw-r--r--crawl-ref/source/dat/descript/skills.txt2
3 files changed, 7 insertions, 9 deletions
diff --git a/crawl-ref/source/dat/database/rand_wpn.txt b/crawl-ref/source/dat/database/rand_wpn.txt
index 48ba1cf3e9..239ae319a7 100644
--- a/crawl-ref/source/dat/database/rand_wpn.txt
+++ b/crawl-ref/source/dat/database/rand_wpn.txt
@@ -84,12 +84,12 @@ War
Eternal War
-Eternal Warrior
+the Eternal Warrior
# Lemuel's Suggestions
-Warrior
+the Warrior
-Doomed Warrior
+the Doomed Warrior
# akrasiac patch
the Pyrrhic Victory
@@ -798,7 +798,7 @@ the Spinneret
Grontol
-With Two Names
+the Two Names
# akrasiac patch
Irrepressible Laughter
@@ -821,8 +821,6 @@ Giant
Beetle
Jelly
-
-@player_genus@
%%%%
monster_name
diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index 5f5a294044..e2399deae4 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -253,7 +253,7 @@ your magical contamination and may eventually cause glowing.
# Makhleb
Minor Destruction
-Shoot a random harmful beam at the targetted monster.
+Shoot a random harmful beam at the targeted monster.
%%%%
Lesser Servant of Makhleb
@@ -262,7 +262,7 @@ skill.
%%%%
Major Destruction
-Inflict a random harmful beam or explosion on the targetted monster.
+Inflict a random harmful beam or explosion on the targeted monster.
%%%%
Greater Servant of Makhleb
diff --git a/crawl-ref/source/dat/descript/skills.txt b/crawl-ref/source/dat/descript/skills.txt
index 17dac0d020..a6058cac7e 100644
--- a/crawl-ref/source/dat/descript/skills.txt
+++ b/crawl-ref/source/dat/descript/skills.txt
@@ -58,7 +58,7 @@ fight with all weapons of this type and make you deal more damage with
them. It is generally recommended to concentrate your efforts on one or
two weapon types to become more powerful in them.
-Being skilled in Polearms eases training in Maces/Flails or Staves.
+Being skilled in Polearms eases training in Axes or Staves.
%%%%
Staves