Menu
▾
▴
[crawl-ref-commits] master branch updated: 0.11-a0-514-ga6f2b52
|
From: <gi...@cr...> - 2012-03-15 17:28:23
|
via a6f2b5275abee87a7163500defecf51da98c41f2 (commit)
via 027890526d279160ec8ed6fb9f7b39d1813e9680 (commit)
from bc44d7b10ec38a1f0a4663572f3b7ea01c58dbbc (commit)
-----------------------------------------------------------------------
commit a6f2b5275abee87a7163500defecf51da98c41f2
Author: David Lawrence Ramsey <dol...@us...>
Date: Thu Mar 15 12:16:33 2012 -0500
Fix typo.
commit 027890526d279160ec8ed6fb9f7b39d1813e9680
Author: David Lawrence Ramsey <dol...@us...>
Date: Thu Mar 15 12:05:23 2012 -0500
For consistency, fix more capitalization with regard to the Shining One.
The database entries now use "the Shining One", as well as the wrath
entries (as opposed to "TSO" from before).
Also, properly use "the Shining One" in the Lugonu bribe altar and the
description of the sword of Jihad.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/database/godspeak.txt | 14 +++++++-------
crawl-ref/source/dat/database/monspeak.txt | 4 ++--
crawl-ref/source/dat/des/altar/lugonu_bribe.des | 2 +-
crawl-ref/source/dat/des/altar/overflow.des | 2 +-
crawl-ref/source/dat/des/variable/float.des | 2 +-
crawl-ref/source/dat/descript/gods.txt | 4 ++--
crawl-ref/source/dat/descript/unrand.txt | 2 +-
crawl-ref/source/godwrath.cc | 2 +-
crawl-ref/source/religion.cc | 3 +--
9 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/crawl-ref/source/dat/database/godspeak.txt b/crawl-ref/source/dat/database/godspeak.txt
index 8977b06..da771d0 100644
--- a/crawl-ref/source/dat/database/godspeak.txt
+++ b/crawl-ref/source/dat/database/godspeak.txt
@@ -561,11 +561,11 @@ Beogh curses everyone not orcish, especially @player_genus_plural@.
Beogh swears eternal hatred towards @player_god@.
%%%%
-#####################################
-# TSO rants on killing a holy being #
-#####################################
+#################################################
+# The Shining One rants on killing a holy being #
+#################################################
# an evil worshipper has killed a holy being
-TSO holy evil
+the Shining One holy evil
The Shining One thunders, "Cease your foul attacks on the divine!"
@@ -576,7 +576,7 @@ The Shining One shouts, "Your misdeeds are remembered unto the final battle!"
The Shining One whispers, "The forces of light will burn you to a crisp."
%%%%
# a non-good worshipper or atheist has killed a holy being
-TSO holy other
+the Shining One holy other
The Shining One says, "As holy lives are taken, so shall yours be."
@@ -774,11 +774,11 @@ Sif Muna welcome
Sif Muna whispers: I know many secrets...
%%%%
-The Shining One penance
+the Shining One penance
The Shining One says: Being a martyr may wash away your sin!
%%%%
-The Shining One welcome
+the Shining One welcome
The Shining One says: Lead the forces of light to victory!
%%%%
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index b270039..1c00d98 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -2816,7 +2816,7 @@ w:50
@The_monster@ says, "If I give you twenty gold pieces, can you get rid of this nasty case of scales I've got?"
%%%%
-The Shining One Donald
+the Shining One Donald
w:50
@_generic_Donald_@
@@ -6080,7 +6080,7 @@ _good_god_
Zin
-The Shining One
+the Shining One
Elyvilon
%%%%
diff --git a/crawl-ref/source/dat/des/altar/lugonu_bribe.des b/crawl-ref/source/dat/des/altar/lugonu_bribe.des
index a963d2b..b8afd96 100644
--- a/crawl-ref/source/dat/des/altar/lugonu_bribe.des
+++ b/crawl-ref/source/dat/des/altar/lugonu_bribe.des
@@ -46,7 +46,7 @@ function callback.tgw_lugonu_bribe_lugonu_item (data, triggerable,
Okawaru="randbook owner:Lugonu spells:summon_butterflies numspells:1 /\
book of Callings / scroll of summoning q:2-3",
["Sif Muna"]="staff of channeling / good_item plate armour",
- ["The Shining One"]="wand of invisibility w:20 / rod of venom /\
+ ["the Shining One"]="wand of invisibility w:20 / rod of venom /\
book of Envenomations / Young Poisoner's Handbook /\
potion of invisibility q:3-6",
Trog="manual of Spellcasting w:100 / manual of Air Magic /\
diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index ed3841c..02c172b 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -33,7 +33,7 @@
default-depth: D
# These must feature one of the temple_overflow_* TAGs (see header).
-# Altars are sorted alphabetically by god, with The Shining One coming
+# Altars are sorted alphabetically by god, with the Shining One coming
# after Zin. At the end, there are altar vaults which can be used for
# more than just one god.
diff --git a/crawl-ref/source/dat/des/variable/float.des b/crawl-ref/source/dat/des/variable/float.des
index 13987ef..1a5d519 100644
--- a/crawl-ref/source/dat/des/variable/float.des
+++ b/crawl-ref/source/dat/des/variable/float.des
@@ -1082,7 +1082,7 @@ ENDMAP
##############################################################################
# The Shining One Protects a Powerful Item, vault series by abrahamwl
#
-# The basic theme of these vaults is that tthe Shining One has placed a
+# The basic theme of these vaults is that the Shining One has placed a
# powerful item under the guard of an angel or daeva.
NAME: abrahamwl_protected_by_tso_1
diff --git a/crawl-ref/source/dat/descript/gods.txt b/crawl-ref/source/dat/descript/gods.txt
index 1500791..e72b0a8 100644
--- a/crawl-ref/source/dat/descript/gods.txt
+++ b/crawl-ref/source/dat/descript/gods.txt
@@ -18,7 +18,7 @@ Zin
Zin is a God for those focused on inner strength. Followers must remain pure of body and soul, refraining from unholy, evil, unclean or chaotic magic; the use of mutations and the consumption of intelligent beings' flesh. They may preach to or imprison the unenlightened, and can ultimately gain a divine refuge. Zin values selflessness, demanding a tithe of 1/10 of all gold gained, preferably followed by donations of more. Zin's followers can safely convert to Elyvilon and the Shining One.
%%%%
-The Shining One
+the Shining One
The Shining One is a powerful deity on a crusade against all evil. Followers and their allies may be granted various blessings upon mercilessly slaying evil and unholy beings. Worshippers must never use unholy or evil magic, and are expected to prove their moral superiority by fighting honourably. The God demands followers to scour the world, examining all of its inhabitants for traces of evil that must be eradicated. The Shining One does not mind shifting worship to Elyvilon or Zin.
%%%%
@@ -90,7 +90,7 @@ Zin powers
Zin grants followers the ability to preach to the unenlightened masses, and powers to vitalise their bodies and gain divine stamina, protecting them from various afflictions as well as giving sustenance to the hungry. Later, followers gain the ability to imprison their foes temporarily. Followers can eventually find temporary safety in a divine refuge. As piety grows, followers will be protected from mutation, and Zin may even occasionally directly intervene to save a follower's life.
%%%%
-The Shining One powers
+the Shining One powers
Followers of the Shining One are surrounded by a halo that reveals their enemies to them. They gain power by killing evil beings. The Shining One will keep summoned and charmed allies on their side longer, should the allies prove worthy of the crusade. Followers will gain use of a divine shield to protect them in battle. Later, they can channel blasts of cleansing flame that are particularly damaging to unholy beings. Eventually, they can ask the Shining One to send them powerful divine beings as allies. The Shining One may occasionally directly intervene to save a follower's life. With growing piety the Shining One will protect a follower's life force.
%%%%
diff --git a/crawl-ref/source/dat/descript/unrand.txt b/crawl-ref/source/dat/descript/unrand.txt
index ab2bb7c..768aa56 100644
--- a/crawl-ref/source/dat/descript/unrand.txt
+++ b/crawl-ref/source/dat/descript/unrand.txt
@@ -131,7 +131,7 @@ treasures. According to legend he was lost somewhere in the Dungeon.
sword of Jihad
A long sword made of one huge piece of crystal.
-Legend says it was The Shining One's gift to a worshipper.
+Legend says it was the Shining One's gift to a worshipper.
%%%%
crossbow "Hellfire"
diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc
index e60bce1..2f22082 100644
--- a/crawl-ref/source/godwrath.cc
+++ b/crawl-ref/source/godwrath.cc
@@ -1374,7 +1374,7 @@ static void _tso_blasts_cleansing_flame(const char *message)
// Currently only used when holy beings have been killed.
static std::string _get_tso_speech(const std::string key)
{
- std::string result = getSpeakString("TSO " + key);
+ std::string result = getSpeakString("the Shining One " + key);
if (result.empty())
return ("The Shining One is angry!");
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index fc2b502..fb50611 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -518,8 +518,7 @@ std::string get_god_powers(god_type which_god)
if (which_god == GOD_NO_GOD)
return ("");
- std::string result = getLongDescription(
- uppercase_first(god_name(which_god)) + " powers");
+ std::string result = getLongDescription(god_name(which_god) + " powers");
return (result);
}
--
Dungeon Crawl Stone Soup
|
