Merge branch 'lava_orcs' into lava_djinn

Waiting for Grotesks and the Forest to go live!

1 files changed, 17 insertions, 0 deletions

diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc
index f90d900079..15fd0269fd 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -236,6 +236,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_DEEP_ELF:
         case SP_SLUDGE_ELF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_KOBOLD:
         case SP_CENTAUR:
@@ -259,6 +260,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_HALFLING:
         case SP_KOBOLD:
@@ -277,6 +279,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_SLUDGE_ELF:
         case SP_DEEP_DWARF:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_HALFLING:
         case SP_KOBOLD:
@@ -298,6 +301,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_SLUDGE_ELF:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_CENTAUR:
         case SP_OGRE:
         case SP_TROLL:
@@ -321,6 +325,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_HIGH_ELF:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_HALFLING:
         case SP_SPRIGGAN:
@@ -398,6 +403,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_HALFLING:
         case SP_SPRIGGAN:
         case SP_CENTAUR:
@@ -417,6 +423,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         {
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_CENTAUR:
         case SP_OGRE:
@@ -457,6 +464,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_HIGH_ELF:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_HALFLING:
         case SP_CENTAUR:
         case SP_OGRE:
@@ -480,6 +488,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
         case SP_DEEP_ELF:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_NAGA:
         case SP_CENTAUR:
         case SP_OGRE:
@@ -504,6 +513,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
             return CC_BANNED;
         case SP_DEEP_ELF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_SPRIGGAN:
         case SP_NAGA:
@@ -551,6 +561,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
             return CC_BANNED;
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_NAGA:
         case SP_TROLL:
@@ -636,6 +647,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_HUMAN:
         case SP_DEEP_DWARF:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MUMMY:
         case SP_CENTAUR:
         case SP_NAGA:
@@ -657,6 +669,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         {
         case SP_HUMAN:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_NAGA:
         case SP_OGRE:
@@ -689,6 +702,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         {
         case SP_HUMAN:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_MERFOLK:
         case SP_NAGA:
         case SP_CENTAUR:
@@ -764,6 +778,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_MERFOLK:
         case SP_OGRE:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_SPRIGGAN:
         case SP_TROLL:
         case SP_SLUDGE_ELF:
@@ -783,6 +798,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_OGRE:
         case SP_TROLL:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_SLUDGE_ELF:
             return CC_RESTRICTED;
         case SP_FELID:
@@ -801,6 +817,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
         case SP_MERFOLK:
         case SP_OGRE:
         case SP_HILL_ORC:
+        case SP_LAVA_ORC:
         case SP_TROLL:
             return CC_RESTRICTED;
         case SP_FELID: