diff options
author | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:13:03 +0200 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:13:03 +0200 |
commit | bad48d64c2a38978bf4ccf19931ea0483f60c843 (patch) | |
tree | 9a752b043b13500799e3f8ba404f253fef404612 /crawl-ref/source/species.cc | |
parent | 42993c7a02bf24d02280df06c7140851e8cabb1a (diff) | |
parent | aff44e3dcf63bf0a5426c8d6998c8954bb44d26d (diff) | |
download | crawl-ref-bad48d64c2a38978bf4ccf19931ea0483f60c843.tar.gz crawl-ref-bad48d64c2a38978bf4ccf19931ea0483f60c843.zip |
Merge branch 'lava_orcs' into lava_djinn
Waiting for Grotesks and the Forest to go live!
Diffstat (limited to 'crawl-ref/source/species.cc')
-rw-r--r-- | crawl-ref/source/species.cc | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/crawl-ref/source/species.cc b/crawl-ref/source/species.cc index bdd53fe8a1..5a7dbd5d89 100644 --- a/crawl-ref/source/species.cc +++ b/crawl-ref/source/species.cc @@ -21,7 +21,7 @@ static species_type species_order[] = { SP_HUMAN, SP_HIGH_ELF, SP_DEEP_ELF, SP_SLUDGE_ELF, SP_DEEP_DWARF, SP_HILL_ORC, - SP_MERFOLK, + SP_LAVA_ORC, SP_MERFOLK, // small species SP_HALFLING, SP_KOBOLD, SP_SPRIGGAN, @@ -60,7 +60,7 @@ static const char * Species_Abbrev_List[NUM_SPECIES] = // the draconians "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Dr", "Ce", "Dg", "Sp", "Mi", "Ds", "Gh", "Te", "Mf", "Vp", "DD", - "Fe", "Op", "Dj", + "Fe", "Op", "Dj", "LO", // placeholders "El", "HD", "OM", "GE", "Gn", "MD", }; @@ -161,6 +161,21 @@ string species_name(species_type speci, bool genus, bool adj) } } break; + case GENPC_ORCISH: + if (adj) // doesn't care about species/genus + res = "Orcish"; + else if (genus) + res = "Orc"; + else + { + switch (speci) + { + case SP_HILL_ORC: res = "Hill Orc"; break; + case SP_LAVA_ORC: res = "Lava Orc"; break; + default: res = "Orc"; break; + } + } + break; case GENPC_NONE: default: switch (speci) @@ -224,6 +239,11 @@ bool species_likes_water(species_type species) || species == SP_OCTOPODE); } +bool species_likes_lava(species_type species) +{ + return (species == SP_LAVA_ORC); +} + genus_type species_genus(species_type species) { switch (species) @@ -245,6 +265,10 @@ genus_type species_genus(species_type species) case SP_SLUDGE_ELF: return GENPC_ELVEN; + case SP_HILL_ORC: + case SP_LAVA_ORC: + return GENPC_ORCISH; + default: return GENPC_NONE; } @@ -291,6 +315,8 @@ monster_type player_species_to_mons_species(species_type species) return MONS_HALFLING; case SP_HILL_ORC: return MONS_ORC; + case SP_LAVA_ORC: + return MONS_LAVA_ORC; case SP_KOBOLD: return MONS_KOBOLD; case SP_MUMMY: @@ -407,6 +433,7 @@ int species_exp_modifier(species_type species) case SP_TROLL: case SP_DEMONSPAWN: case SP_DJINNI: + case SP_LAVA_ORC: return -1; case SP_DEMIGOD: return -2; @@ -449,6 +476,7 @@ int species_hp_modifier(species_type species) case SP_PALE_DRACONIAN: case SP_GHOUL: case SP_HILL_ORC: + case SP_LAVA_ORC: case SP_MINOTAUR: return 1; case SP_DEEP_DWARF: |