summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/jobs.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2011-02-18 19:17:41 +0000
committerChris Campbell <chriscampbell89@gmail.com>2011-02-18 19:25:26 +0000
commit1d83d27b2f203060e91c6742e3b95ad49ca714ac (patch)
tree4a72e1bdc241d35dc5fc0ad2db44eac4af888628 /crawl-ref/source/jobs.cc
parent07ae9944187739b895ef68a956a8d0a0c205b6d2 (diff)
downloadcrawl-ref-1d83d27b2f203060e91c6742e3b95ad49ca714ac.tar.gz
crawl-ref-1d83d27b2f203060e91c6742e3b95ad49ca714ac.zip
Remove CK[Makh], Pr[Yred]->Death Knight, CK[Lugonu]->Abyssal Knight
In summary: Chaos Knights worship Xom. Priests worship Zin (and Hill Orcs can select Beogh). Death Knights worship Yredelemnul. Abyssal Knights worship Lugonu. (Unchanged: Berserkers worship Trog, Healers worship Elyvilon).
Diffstat (limited to 'crawl-ref/source/jobs.cc')
-rw-r--r--crawl-ref/source/jobs.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/crawl-ref/source/jobs.cc b/crawl-ref/source/jobs.cc
index 12b5e3fe1a..ee6569e509 100644
--- a/crawl-ref/source/jobs.cc
+++ b/crawl-ref/source/jobs.cc
@@ -11,9 +11,9 @@ static job_type jobs_order[] = {
JOB_FIGHTER, JOB_GLADIATOR,
JOB_MONK, JOB_BERSERKER,
// religious professions (incl. Berserker above)
- JOB_PRIEST,
- JOB_HEALER, JOB_CHAOS_KNIGHT,
- JOB_CRUSADER,
+ JOB_CHAOS_KNIGHT, JOB_DEATH_KNIGHT,
+ JOB_ABYSSAL_KNIGHT, JOB_PRIEST,
+ JOB_HEALER, JOB_CRUSADER,
// general and niche spellcasters (incl. Crusader above)
JOB_REAVER, JOB_WARPER,
JOB_WIZARD, JOB_CONJURER,
@@ -45,7 +45,8 @@ static const char * Job_Abbrev_List[ NUM_JOBS ] =
"As", "Be", "Hu",
"Cj", "En", "FE", "IE", "Su", "AE", "EE", "Cr",
"VM",
- "CK", "Tm", "He", "Re", "St", "Mo", "Wr", "Wn", "Ar", "AM" };
+ "CK", "Tm", "He", "Re", "St", "Mo", "Wr", "Wn", "Ar", "AM",
+ "DK", "AK" };
static const char * Job_Name_List[ NUM_JOBS ] =
{ "Fighter", "Wizard", "Priest",
@@ -53,12 +54,13 @@ static const char * Job_Name_List[ NUM_JOBS ] =
#if TAG_MAJOR_VERSION == 32
"Paladin",
#endif
- "Assassin", "Berserker", "Hunter", "Conjurer", "Enchanter",
+ "Assassin", "Berserker", "Hunter", "Conjurer", "Enchanter",
"Fire Elementalist", "Ice Elementalist", "Summoner", "Air Elementalist",
"Earth Elementalist", "Crusader",
"Venom Mage",
"Chaos Knight", "Transmuter", "Healer", "Reaver", "Stalker",
- "Monk", "Warper", "Wanderer", "Artificer", "Arcane Marksman" };
+ "Monk", "Warper", "Wanderer", "Artificer", "Arcane Marksman",
+ "Death Knight", "Abyssal Knight" };
const char *get_job_abbrev(int which_job)
{