summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-pick-data.h
diff options
context:
space:
mode:
authorreaverb <reaverb.Crawl@gmail.com>2014-06-07 21:06:11 -0400
committerreaverb <reaverb.Crawl@gmail.com>2014-06-07 23:51:21 -0400
commit57c10a80aea6fe3093246d5bc8770f1f4a2f71df (patch)
tree02c4d414058c03c5de297c12f50073b3db48fd03 /crawl-ref/source/mon-pick-data.h
parentb0c9e7892796b91383c174755e9888fc75e8857d (diff)
downloadcrawl-ref-57c10a80aea6fe3093246d5bc8770f1f4a2f71df.tar.gz
crawl-ref-57c10a80aea6fe3093246d5bc8770f1f4a2f71df.zip
Remove Hall of Blades
The complaints against the branch are well documented, mostly stating Dancing Weapons are awful enemies and the Hall of Blades is filled with them.
Diffstat (limited to 'crawl-ref/source/mon-pick-data.h')
-rw-r--r--crawl-ref/source/mon-pick-data.h21
1 files changed, 14 insertions, 7 deletions
diff --git a/crawl-ref/source/mon-pick-data.h b/crawl-ref/source/mon-pick-data.h
index 390a6fa1cd..24a95fd4c0 100644
--- a/crawl-ref/source/mon-pick-data.h
+++ b/crawl-ref/source/mon-pick-data.h
@@ -195,7 +195,6 @@ static const pop_entry pop_elf[] =
{ 6, 7, 10, UP, MONS_DEEP_ELF_MASTER_ARCHER },
{ 0,0,0,FLAT,MONS_0 }
};
-
#if TAG_MAJOR_VERSION == 34
static const pop_entry pop_dwarf[] =
{ // Dwarven Hall
@@ -214,6 +213,12 @@ static const pop_entry pop_dwarf[] =
{ 1, 1, 8, FLAT, MONS_PHANTASMAL_WARRIOR },
{ 0,0,0,FLAT,MONS_0 }
};
+
+static const pop_entry pop_blade[] =
+{ // Hall of Blades
+ { 1, 1, 1000, FLAT, MONS_DANCING_WEAPON },
+ { 0,0,0,FLAT,MONS_0 }
+};
#endif
static const pop_entry pop_lair[] =
@@ -473,12 +478,6 @@ static const pop_entry pop_vaults[] =
{ 0,0,0,FLAT,MONS_0 }
};
-static const pop_entry pop_blade[] =
-{ // Hall of Blades
- { 1, 1, 1000, FLAT, MONS_DANCING_WEAPON },
- { 0,0,0,FLAT,MONS_0 }
-};
-
static const pop_entry pop_crypt[] =
{ // Crypt
{ 2, 7, 145, SEMI, MONS_EIDOLON },
@@ -1139,7 +1138,9 @@ static const struct { const pop_entry *pop; int count; } population[] =
POP(spider),
POP(slime),
POP(vaults),
+#if TAG_MAJOR_VERSION == 34
POP(blade),
+#endif
POP(crypt),
POP(tomb),
#if TAG_MAJOR_VERSION > 34
@@ -1247,7 +1248,9 @@ static const struct { const pop_entry *pop; int count; } population_zombie[] =
POP(spider),
POP(slime),
POP(vaults),
+#if TAG_MAJOR_VERSION == 34
POP(blade),
+#endif
POP(generic_late_zombie),
POP(generic_late_zombie),
#if TAG_MAJOR_VERSION > 34
@@ -1357,7 +1360,9 @@ static const struct { const pop_entry *pop; int count; } population_water[] =
POP(water_generic),
POP(water_generic),
POP(water_generic),
+#if TAG_MAJOR_VERSION == 34
POP(water_generic),
+#endif
POP(water_generic),
POP(water_generic),
#if TAG_MAJOR_VERSION > 34
@@ -1459,7 +1464,9 @@ static const struct { const pop_entry *pop; int count; } population_lava[] =
POP(lava_generic),
POP(lava_generic),
POP(lava_generic),
+#if TAG_MAJOR_VERSION == 34
POP(lava_generic),
+#endif
POP(lava_generic),
POP(lava_generic),
#if TAG_MAJOR_VERSION > 34