diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-02 11:09:45 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-02 11:09:45 +0000 |
| commit | 8f7d489f3cd6deac14f517f459a991e22d015ed6 (patch) | |
| tree | 66bacb31af7083100a7133f8dfe0e591edbf4757 /crawl-ref/source/enum.h | |
| parent | 95a05880fa4501233845f38cc5e28a78a76b3c80 (diff) | |
| download | crawl-ref-8f7d489f3cd6deac14f517f459a991e22d015ed6.tar.gz crawl-ref-8f7d489f3cd6deac14f517f459a991e22d015ed6.zip | |
[FR 1816805] Implementing a new species/classes order on the character
selection screen
This involved the following:
* tentative clean-up of newgame.cc (an utter nightmare!)
* throw out JOB_QUITTER and SP_UNKx_DRACONIAN as (as far as I can tell)
they serve absolutely no purpose (Should they be necessary for scoring
etc. it's probably better to put these at the end rather than the
middle of the lists.)
* breaks saves
I'm quite happy with the new species order, but the order of jobs could
be improved. Luckily, changing that is totally easy now. :)
See newgame.cc for old vs. new orders.
(And yes, there is an option to keep the old way.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3503 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index b68dde3cfe..b16392d9f0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1311,13 +1311,12 @@ enum job_type JOB_VENOM_MAGE, JOB_CHAOS_KNIGHT, // 20 JOB_TRANSMUTER, - JOB_HEALER, // 22 - JOB_QUITTER, // 23 -- this is job 'x', don't use - JOB_REAVER, // 24 - JOB_STALKER, // 25 - JOB_MONK, + JOB_HEALER, + JOB_REAVER, + JOB_STALKER, + JOB_MONK, // 25 JOB_WARPER, - JOB_WANDERER, // 23 + JOB_WANDERER, // 27 NUM_JOBS, // always after the last job JOB_UNKNOWN = 100 @@ -2330,7 +2329,7 @@ enum species_type SP_GNOME, SP_OGRE, SP_TROLL, - SP_OGRE_MAGE, + SP_OGRE_MAGE, // 15 SP_RED_DRACONIAN, SP_WHITE_DRACONIAN, SP_GREEN_DRACONIAN, @@ -2340,18 +2339,16 @@ enum species_type SP_PURPLE_DRACONIAN, SP_MOTTLED_DRACONIAN, SP_PALE_DRACONIAN, - SP_UNK0_DRACONIAN, - SP_UNK1_DRACONIAN, - SP_BASE_DRACONIAN, - SP_CENTAUR, + SP_BASE_DRACONIAN, // 25 + SP_CENTAUR, SP_DEMIGOD, - SP_SPRIGGAN, // 30 + SP_SPRIGGAN, SP_MINOTAUR, - SP_DEMONSPAWN, - SP_GHOUL, + SP_DEMONSPAWN, // 30 + SP_GHOUL, SP_KENKU, - SP_MERFOLK, // 35 - SP_VAMPIRE, + SP_MERFOLK, + SP_VAMPIRE, // 34 SP_ELF, // (placeholder) SP_HILL_DWARF, // (placeholder) NUM_SPECIES, // always after the last species |