From fa266d7d61eee04c063b22d00981c8f879ecd7f6 Mon Sep 17 00:00:00 2001
From: gammafunk <gammafunk@gmail.com>
Date: Thu, 28 Nov 2013 23:53:14 -0600
Subject: [PATCH] Move tengu to 'Q' to free up room on 'H'

---
 crawl-ref/source/mon-data.h | 138 ++++++++++++++++++++++----------------------
 1 file changed, 70 insertions(+), 68 deletions(-)

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 32dbb7a..cc4931e 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -3329,60 +3329,6 @@ static monsterentry mondata[] =
 },
 
 {
-    MONS_TENGU, 'H', LIGHTBLUE, "tengu",
-    M_WARM_BLOOD | M_SPEAKS | M_HYBRID,
-    MR_NO_FLAGS,
-    550, 10, MONS_TENGU, MONS_TENGU, MH_NATURAL, -3,
-    { {AT_HIT, AF_PLAIN, 10}, {AT_PECK, AF_PLAIN, 5}, {AT_CLAW, AF_PLAIN, 5},
-       AT_NO_ATK },
-    { 5, 3, 3, 0 },
-    2, 12, MST_NO_SPELLS, CE_CLEAN /*chicken*/, Z_SMALL, S_SHOUT,
-    I_NORMAL, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
-    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
-},
-
-{
-    MONS_TENGU_CONJURER, 'H', BLUE, "tengu conjurer",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS
-        | M_HYBRID,
-    MR_NO_FLAGS,
-    550, 13, MONS_TENGU, MONS_TENGU, MH_NATURAL, -3,
-    { {AT_HIT, AF_PLAIN, 10}, {AT_PECK, AF_PLAIN, 5}, {AT_CLAW, AF_PLAIN, 5},
-       AT_NO_ATK },
-    { 7, 3, 3, 0 },
-    2, 17, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT,
-    I_NORMAL, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
-    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
-},
-
-{
-    MONS_TENGU_WARRIOR, 'H', CYAN, "tengu warrior",
-    M_FIGHTER | M_WARM_BLOOD | M_SPEAKS | M_HYBRID,
-    MR_NO_FLAGS,
-    550, 13, MONS_TENGU, MONS_TENGU, MH_NATURAL, -3,
-    { {AT_HIT, AF_PLAIN, 16}, {AT_PECK, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8},
-       AT_NO_ATK },
-    { 10, 4, 4, 0 },
-    2, 17, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT,
-    I_NORMAL, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
-    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
-},
-
-{
-    MONS_TENGU_REAVER, 'H', LIGHTMAGENTA, "tengu reaver",
-    M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD
-        | M_SPEAKS | M_HYBRID,
-    MR_NO_FLAGS,
-    550, 13, MONS_TENGU, MONS_TENGU, MH_NATURAL, -3,
-    { {AT_HIT, AF_PLAIN, 27}, {AT_PECK, AF_PLAIN, 11}, {AT_CLAW, AF_PLAIN, 11},
-       AT_NO_ATK },
-    { 17, 3, 4, 0 },
-    2, 17, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT,
-    I_HIGH, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
-    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
-},
-
-{
     MONS_SHEDU, 'H', WHITE, "shedu",
     M_WARM_BLOOD | M_ALWAYS_CORPSE | M_SPELLCASTER | M_HYBRID,
     MR_RES_POISON,
@@ -3958,6 +3904,61 @@ static monsterentry mondata[] =
     MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
 },
 
+// tengu ('Q')
+{
+    MONS_TENGU, 'Q', LIGHTBLUE, "tengu",
+    M_WARM_BLOOD | M_SPEAKS | M_HYBRID,
+    MR_NO_FLAGS,
+    550, 10, MONS_TENGU, MONS_TENGU, MH_NATURAL, -3,
+    { {AT_HIT, AF_PLAIN, 10}, {AT_PECK, AF_PLAIN, 5}, {AT_CLAW, AF_PLAIN, 5},
+       AT_NO_ATK },
+    { 5, 3, 3, 0 },
+    2, 12, MST_NO_SPELLS, CE_CLEAN /*chicken*/, Z_SMALL, S_SHOUT,
+    I_NORMAL, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
+    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
+{
+    MONS_TENGU_CONJURER, 'Q', BLUE, "tengu conjurer",
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS
+        | M_HYBRID,
+    MR_NO_FLAGS,
+    550, 13, MONS_TENGU, MONS_TENGU, MH_NATURAL, -3,
+    { {AT_HIT, AF_PLAIN, 10}, {AT_PECK, AF_PLAIN, 5}, {AT_CLAW, AF_PLAIN, 5},
+       AT_NO_ATK },
+    { 7, 3, 3, 0 },
+    2, 17, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT,
+    I_NORMAL, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
+    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
+{
+    MONS_TENGU_WARRIOR, 'Q', CYAN, "tengu warrior",
+    M_FIGHTER | M_WARM_BLOOD | M_SPEAKS | M_HYBRID,
+    MR_NO_FLAGS,
+    550, 13, MONS_TENGU, MONS_TENGU, MH_NATURAL, -3,
+    { {AT_HIT, AF_PLAIN, 16}, {AT_PECK, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8},
+       AT_NO_ATK },
+    { 10, 4, 4, 0 },
+    2, 17, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT,
+    I_NORMAL, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
+    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
+{
+    MONS_TENGU_REAVER, 'Q', LIGHTMAGENTA, "tengu reaver",
+    M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD
+        | M_SPEAKS | M_HYBRID,
+    MR_NO_FLAGS,
+    550, 13, MONS_TENGU, MONS_TENGU, MH_NATURAL, -3,
+    { {AT_HIT, AF_PLAIN, 27}, {AT_PECK, AF_PLAIN, 11}, {AT_CLAW, AF_PLAIN, 11},
+       AT_NO_ATK },
+    { 17, 3, 4, 0 },
+    2, 17, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT,
+    I_HIGH, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
+    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
 // spiritual beings ('R')
 {
     MONS_EFREET, 'R', RED, "efreet",
@@ -6493,20 +6494,6 @@ static monsterentry mondata[] =
     MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_LARGE
 },
 
-{
-    MONS_SOJOBO, 'H', LIGHTGREEN, "Sojobo",
-    M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD
-        | M_SPEAKS | M_DEFLECT_MISSILES | M_UNIQUE,
-    MR_NO_FLAGS,
-    550, 18, MONS_TENGU, MONS_TENGU, MH_NATURAL, -5,
-    { {AT_HIT, AF_PLAIN, 28}, {AT_PECK, AF_PLAIN, 14}, {AT_CLAW, AF_PLAIN, 14},
-       AT_NO_ATK },
-    { 20, 0, 0, 150 },
-    2, 22, MST_SOJOBO, CE_CLEAN, Z_NOZOMBIE, S_SHOUT,
-    I_HIGH, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
-    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
-},
-
 // Spr"i"ggans.
 {
     MONS_AGNES, 'i', LIGHTCYAN, "Agnes",
@@ -6719,6 +6706,21 @@ static monsterentry mondata[] =
     MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
 },
 
+// tengu ('Q')
+{
+    MONS_SOJOBO, 'Q', LIGHTGREEN, "Sojobo",
+    M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD
+        | M_SPEAKS | M_DEFLECT_MISSILES | M_UNIQUE,
+    MR_NO_FLAGS,
+    550, 18, MONS_TENGU, MONS_TENGU, MH_NATURAL, -5,
+    { {AT_HIT, AF_PLAIN, 28}, {AT_PECK, AF_PLAIN, 14}, {AT_CLAW, AF_PLAIN, 14},
+       AT_NO_ATK },
+    { 20, 0, 0, 150 },
+    2, 22, MST_SOJOBO, CE_CLEAN, Z_NOZOMBIE, S_SHOUT,
+    I_HIGH, HT_LAND, FL_LEVITATE, 10, MOVE_ENERGY(9),
+    MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
 // Dwarves
 {
     MONS_WIGLAF, 'q', YELLOW, "Wiglaf",
-- 
1.8.3.2

