Remove Reavers at the next major save version

9 files changed, 16 insertions, 60 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index f41bb1fd2b..35cd0c70cb 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -1969,11 +1969,6 @@ The Crusader is a decent fighter who can use the magical arts of
 enchantment to become more dangerous in battle. Crusaders start out
 lightly armed and armoured, but equipped with a book of martial spells.
 
-Reavers:
---------
-Reavers are warriors who learn the magics of destruction in order to
-complement their deadliness in hand combat.
-
 Warpers:
 --------
 Warpers specialise in translocation magic, and are experts in travelling
diff --git a/crawl-ref/source/dat/descript/backgrounds.txt b/crawl-ref/source/dat/descript/backgrounds.txt
index 5d5d069bb6..74bfc651a6 100644
--- a/crawl-ref/source/dat/descript/backgrounds.txt
+++ b/crawl-ref/source/dat/descript/backgrounds.txt
@@ -83,10 +83,6 @@ Priest
 
 Priests are followers of Zin, spreading the god's word to the Dungeon's inhabitants. Hill Orcs can follow the orc god Beogh.
 %%%%
-Reaver
-
-Reavers are versatile, using destructive magics alongside melee fighting.
-%%%%
 Stalker
 
 Stalkers use stealth and transformative magic to approach and subdue their victims.
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 0360e06803..8e8a25e2bb 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1637,7 +1637,9 @@ enum job_type
     JOB_CHAOS_KNIGHT,
     JOB_TRANSMUTER,
     JOB_HEALER,
+#if TAG_MAJOR_VERSION == 32
     JOB_REAVER,
+#endif
     JOB_STALKER,
     JOB_MONK,
     JOB_WARPER,
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 35e2c7d148..31750e6c78 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -373,7 +373,7 @@ static job_type _str_to_job(const std::string &str)
         job = get_job_by_name(str.c_str());
 
 #if TAG_MAJOR_VERSION == 32
-    if (job == JOB_PALADIN)
+    if (job == JOB_PALADIN || job == JOB_REAVER)
         job = JOB_UNKNOWN;
 #endif
 
diff --git a/crawl-ref/source/jobs.cc b/crawl-ref/source/jobs.cc
index ee6569e509..841035dcc0 100644
--- a/crawl-ref/source/jobs.cc
+++ b/crawl-ref/source/jobs.cc
@@ -15,7 +15,7 @@ static job_type jobs_order[] = {
     JOB_ABYSSAL_KNIGHT,     JOB_PRIEST,
     JOB_HEALER,             JOB_CRUSADER,
     // general and niche spellcasters (incl. Crusader above)
-    JOB_REAVER,             JOB_WARPER,
+    JOB_WARPER,
     JOB_WIZARD,             JOB_CONJURER,
     JOB_ENCHANTER,          JOB_SUMMONER,
     JOB_NECROMANCER,        JOB_TRANSMUTER,
@@ -45,7 +45,11 @@ 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",
+#if TAG_MAJOR_VERSION == 32
+      "Re",
+#endif
+      "St", "Mo", "Wr", "Wn", "Ar", "AM",
       "DK", "AK" };
 
 static const char * Job_Name_List[ NUM_JOBS ] =
@@ -58,7 +62,11 @@ static const char * Job_Name_List[ NUM_JOBS ] =
       "Fire Elementalist", "Ice Elementalist", "Summoner", "Air Elementalist",
       "Earth Elementalist", "Crusader",
       "Venom Mage",
-      "Chaos Knight", "Transmuter", "Healer", "Reaver", "Stalker",
+      "Chaos Knight", "Transmuter", "Healer",
+#if TAG_MAJOR_VERSION == 32
+      "Reaver",
+#endif
+      "Stalker",
       "Monk", "Warper", "Wanderer", "Artificer", "Arcane Marksman",
       "Death Knight", "Abyssal Knight" };
 
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 5a9cbdeec4..2860b09647 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1698,7 +1698,6 @@ static bool _choose_weapon(newgame_def* ng, newgame_def* ng_choice,
     case JOB_DEATH_KNIGHT:
     case JOB_ABYSSAL_KNIGHT:
     case JOB_CRUSADER:
-    case JOB_REAVER:
     case JOB_WARPER:
         break;
     default:
@@ -2089,7 +2088,6 @@ static bool _choose_book(newgame_def* ng, newgame_def* ng_choice,
 {
     switch (ng->job)
     {
-    case JOB_REAVER:
     case JOB_CONJURER:
         return (_choose_book(ng, ng_choice, defaults, BOOK_CONJURATIONS_I, 2));
     default:
diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc
index a461846249..db234bce48 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -215,32 +215,6 @@ char_choice_restriction job_allowed(species_type speci, job_type job)
                 return (CC_UNRESTRICTED);
         }
 
-        case JOB_REAVER:
-            switch (speci)
-        {
-            case SP_HUMAN:
-            case SP_SLUDGE_ELF:
-            case SP_DEEP_DWARF:
-            case SP_HILL_ORC:
-            case SP_HALFLING:
-            case SP_KOBOLD:
-            case SP_SPRIGGAN:
-            case SP_NAGA:
-            case SP_CENTAUR:
-            case SP_OGRE:
-            case SP_TROLL:
-            case SP_MINOTAUR:
-            case SP_KENKU:
-            case SP_BASE_DRACONIAN:
-            case SP_DEMONSPAWN:
-            case SP_MUMMY:
-            case SP_GHOUL:
-            case SP_VAMPIRE:
-                return (CC_RESTRICTED);
-            default:
-                return (CC_UNRESTRICTED);
-        }
-
         case JOB_WIZARD:
             switch (speci)
         {
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 37d4f3ed77..af860de565 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -158,7 +158,6 @@ static void _jobs_stat_init(job_type which_job)
     case JOB_DEATH_KNIGHT:      s =  5; i =  3; d =  4; hp = 13; mp = 1; break;
     case JOB_ABYSSAL_KNIGHT:    s =  4; i =  4; d =  4; hp = 13; mp = 1; break;
 
-    case JOB_REAVER:            s =  5; i =  5; d =  2; hp = 13; mp = 1; break;
     case JOB_HEALER:            s =  5; i =  5; d =  2; hp = 13; mp = 2; break;
     case JOB_PRIEST:            s =  5; i =  4; d =  3; hp = 12; mp = 1; break;
 
@@ -667,23 +666,6 @@ static void _give_items_skills(const newgame_def& ng)
         weap_skill = 2;
         break;
 
-    case JOB_REAVER:
-        newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_SHORT_SWORD);
-        _update_weapon(ng);
-
-        newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR,
-                           ARM_ROBE);
-        newgame_make_item(2, EQ_NONE, OBJ_BOOKS,
-                           start_to_book(BOOK_CONJURATIONS_I, ng.book));
-
-        you.skills[SK_FIGHTING]     = 2;
-        you.skills[SK_ARMOUR]       = 1;
-        you.skills[SK_DODGING]      = 1;
-        you.skills[SK_SPELLCASTING] = 1;
-        you.skills[SK_CONJURATIONS] = 2;
-        weap_skill = 3;
-        break;
-
     case JOB_WARPER:
         newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_SHORT_SWORD);
         _update_weapon(ng);
@@ -1309,7 +1291,6 @@ static void _give_basic_spells(job_type which_job)
         }
         // intentional fall-through
     case JOB_CONJURER:
-    case JOB_REAVER:
         which_spell = SPELL_MAGIC_DART;
         break;
     case JOB_VENOM_MAGE:
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc
index cc2001f494..dd197f590f 100644
--- a/crawl-ref/source/tilepick-p.cc
+++ b/crawl-ref/source/tilepick-p.cc
@@ -699,12 +699,14 @@ void tilep_job_default(int job, dolls_data *doll)
             parts[TILEP_PART_LEG]   = TILEP_LEG_BELT_REDBROWN;
             break;
 
+#if TAG_MAJOR_VERSION == 32
         case JOB_REAVER:
             parts[TILEP_PART_BODY]  = TILEP_BODY_ROBE_BLACK_GOLD;
             parts[TILEP_PART_LEG]   = TILEP_LEG_PANTS_BROWN;
             parts[TILEP_PART_HAND2] = TILEP_HAND2_BOOK_RED_DIM;
             parts[TILEP_PART_BOOTS] = TILEP_BOOTS_SHORT_BROWN;
             break;
+#endif
 
         case JOB_STALKER:
             parts[TILEP_PART_HELM]  = TILEP_HELM_HOOD_GREEN;