|
Attached Files:
|
 remove_dummy_monsters_fix.patch [^] (12,100 bytes) 2014-02-08 21:11 [Show Content] [Hide Content]From ee340ce991df55b8c38e8c5e38eaef13ab56c404 Mon Sep 17 00:00:00 2001
From: Andrew Minton <a@cowmuffins.net>
Date: Sat, 8 Feb 2014 13:09:46 -0700
Subject: [PATCH] Remove species dummy monsters from vaults.
---
crawl-ref/source/dat/des/altar/overflow.des | 10 ++----
crawl-ref/source/dat/des/branches/abyss.des | 2 +-
crawl-ref/source/dat/des/branches/pan.des | 8 ++---
.../dat/des/branches/vaults_rooms_standard.des | 4 +--
crawl-ref/source/dat/des/builder/food.des | 25 ---------------
crawl-ref/source/dat/des/portals/volcano.des | 5 ++-
crawl-ref/source/dat/des/sprint/sprint_mu.des | 6 ++--
.../source/dat/des/variable/grated_community.des | 12 ++++----
.../source/dat/des/variable/mini_monsters.des | 36 ++++++----------------
9 files changed, 28 insertions(+), 80 deletions(-)
diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index d59f10d..1e9770a 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -1228,12 +1228,12 @@ MAP
.....
ENDMAP
-NAME: okawaru_dwarf
+NAME: okawaru_human
TAGS: uniq_altar_okawaru temple_overflow_1 temple_overflow_okawaru
TAGS: no_monster_gen no_wall_fixup
DEPTH: 7-12
COLOUR: 1 = yellow, ' = yellow, x = white
-MONS: dwarf
+MONS: human
FTILE: 1'xO = floor_sandstone
RTILE: x = wall_tomb
KFEAT: _ = altar_okawaru
@@ -1825,13 +1825,7 @@ TAGS: temple_overflow_1 temple_overflow_yredelemnul no_monster_gen no_item_gen
DEPTH: D:2-9
KFEAT: _ = altar_yredelemnul
KFEAT: . = known web trap / .
-: if you.absdepth() <= 4 then
KMONS: _ = spectral orc
-: elseif you.absdepth() <= 7 then
-KMONS: _ = spectral human hd:3
-: else
-KMONS: _ = spectral elf hd:5
-: end
MAP
xxxxxxxxx
xcccccccx
diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index 6363528..3389fd7 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -885,7 +885,7 @@ NAME: hangedman_abyss_town
TAGS: no_monster_gen patrolling allow_dup
WEIGHT: 5
MONS: rakshasa / efreet / smoke demon / wizard / base draconian w:5 / \
- guardian serpent w:1 / tengu w:3 / vampire w:3 / octopode w:3 / \
+ guardian serpent w:1 / vampire w:3 / octopode w:3 / \
eidolon w:5
MONS: thrashing horror / ancient zyme w:5 / very ugly thing / \
large abomination / unseen horror / vapour w:5 / shapeshifter / \
diff --git a/crawl-ref/source/dat/des/branches/pan.des b/crawl-ref/source/dat/des/branches/pan.des
index b63d28b..ba6865b 100644
--- a/crawl-ref/source/dat/des/branches/pan.des
+++ b/crawl-ref/source/dat/des/branches/pan.des
@@ -2120,10 +2120,10 @@ TAGS: no_trap_gen
WEIGHT: 1
KPROP: tb = no_rtele_into
NSUBST: t = 10:p / *:., b = 10:p / *:.
-KMONS: p = human / elf / orc / naga / centaur / draconian / \
- ogre / minotaur / troll / kobold / mummy / ghoul / spriggan / dwarf / \
- deep dwarf / felid / octopode / vampire / base draconian / demigod / \
- demonspawn / merfolk / halfling
+KMONS: p = human / orc / naga / centaur / \
+ ogre / minotaur / troll / kobold / mummy / ghoul / spriggan / \
+ octopode / vampire / base draconian / \
+ merfolk / halfling
: pan_demonic_rune(_G, 'P', true)
: pan_lord_vault_contents(_G, 'A', 'B<', 'C')
MAP
diff --git a/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des b/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
index fc5fe66..cbfff5e 100644
--- a/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
+++ b/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
@@ -238,10 +238,8 @@ KMONS: S = human; robe
# the bouncers:
KMONS: B: iron troll / cyclops / stone giant / minotaur / vault guard
# the fans:
-SUBST: F = 011112223334455679.........
+SUBST: F = 011112223344569.........
MONS: human; leather armour|ring mail . dagger|club|whip|nothing
-MONS: elf; robe|leather armour . w:24 quarterstaff|w:1 lajatang|w:75 nothing
-# these are Sludge Elves.
MONS: ghoul / necrophage / plague shambler / vampire
MONS: wizard / necromancer
MONS: big kobold / kobold demonologist
diff --git a/crawl-ref/source/dat/des/builder/food.des b/crawl-ref/source/dat/des/builder/food.des
index 6254171..f6264a5 100644
--- a/crawl-ref/source/dat/des/builder/food.des
+++ b/crawl-ref/source/dat/des/builder/food.des
@@ -324,31 +324,6 @@ MAP
.......
ENDMAP
-# 22.0k/29.5k/0
-# A couple of tengu have staked out a little piece of the dungeon.
-NAME: grunt_tengu_nest
-DEPTH: D:9-14
-: food_weight(_G, 9)
-WEIGHT: 15
-TAGS: uniq_second_food extra chance_second_food no_monster_gen patrolling
-MONS: tengu ; war axe | scimitar | long sword, plant
-NSUBST: 2 : 3:2 / *:.
-ITEM: bread ration no_mimic / snozzcumber q:3 no_mimic / \
- orange q:4 w:5 no_mimic / orange q:5 w:5 no_mimic / \
- banana q:4 w:5 no_mimic / banana q:5 w:5 no_mimic / \
- lemon q:4 w:5 no_mimic / lemon q:4 w:5 no_mimic / \
- pear q:6 no_mimic / apple q:6 no_mimic / apricot q:6 no_mimic / \
- choko q:7 no_mimic / rambutan q:7 no_mimic / lychee q:7 no_mimic
-MAP
- xx+xx
-xx2.2xx
-x22222x
-x22222x
-xd1t1dx
-xxdddxx
- xxxxx
-ENDMAP
-
# 22.2k/17.7k/12.6k
# An ogre roasts intruders over his little campfire.
NAME: grunt_ogre_cave
diff --git a/crawl-ref/source/dat/des/portals/volcano.des b/crawl-ref/source/dat/des/portals/volcano.des
index 76b31d1..0d0ea07 100644
--- a/crawl-ref/source/dat/des/portals/volcano.des
+++ b/crawl-ref/source/dat/des/portals/volcano.des
@@ -1065,9 +1065,8 @@ NSUBST: t = 1:! / *:.
KFEAT: ! = alarm trap
# The monsters.
MONS: mummy / vampire
-MONS: manticore skeleton / ogre skeleton / spriggan skeleton / centaur skeleton / \
- tengu skeleton
-MONS: hill giant skeleton / troll skeleton / draconian skeleton / naga skeleton / \
+MONS: manticore skeleton / ogre skeleton / spriggan skeleton / centaur skeleton
+MONS: hill giant skeleton / troll skeleton / naga skeleton / \
minotaur skeleton / sphinx skeleton w:5
KMONS: 4 = guardian mummy / Menkaure w:5, guardian mummy
# Loot: 21 gold, 10 items.
diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des
index f02b019..98e9f39 100644
--- a/crawl-ref/source/dat/des/sprint/sprint_mu.des
+++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -165,7 +165,7 @@ MONS: patrolling ooze / patrolling grey rat
MONS: patrolling giant mite / patrolling grey rat / patrolling jessica
MONS: patrolling phantom hd:2 / patrolling wolf hd:2 / patrolling scorpion / \
patrolling crazy yiuf
-MONS: patrolling human hd:2 hp:35 / patrolling elf hd:2 hp:30
+MONS: patrolling human hd:2 hp:35
KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \
potion of cure mutation ident:all q:2 / potion of cure mutation q:1 / any potion, \
meat ration / bread ration / royal jelly / honeycomb / choko, \
@@ -198,7 +198,7 @@ MONS: patrolling ooze / patrolling grey rat
MONS: patrolling giant mite / patrolling grey rat / patrolling jessica
MONS: patrolling phantom hd:2 / patrolling wolf hd:2 / patrolling scorpion / \
patrolling crazy yiuf
-MONS: patrolling human hd:2 hp:35 / patrolling elf hd:2 hp:30
+MONS: patrolling human hd:2 hp:35
KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \
potion of cure mutation ident:all q:2 / potion of cure mutation q:1 / any potion, \
meat ration / bread ration / royal jelly / honeycomb / choko, \
@@ -263,7 +263,7 @@ KFEAT: M = altar_makhleb
KFEAT: D = altar_dithmengos
KMONS: l = patrolling spatial vortex
KFEAT: ? = altar_jiyva / w:5 altar_lugonu / w:25 floor
-KMONS: m = demigod
+KMONS: m = human
KMONS: j = patrolling jelly
KITEM: * = royal jelly
COLOUR: # = yellow
diff --git a/crawl-ref/source/dat/des/variable/grated_community.des b/crawl-ref/source/dat/des/variable/grated_community.des
index ae808e3..a9b95e7 100644
--- a/crawl-ref/source/dat/des/variable/grated_community.des
+++ b/crawl-ref/source/dat/des/variable/grated_community.des
@@ -27,17 +27,17 @@ KMONS: k = patrolling vampire mage / patrolling boggart
KMONS: d = orc warlord
: if you.absdepth() < 23 then
KMONS: e = vampire / yaktaur /\
- ettin / orc / wolf / draconian / iron troll /\
- deep troll / cyclops / deep dwarf / centaur / warg / wizard
+ ettin / orc / wolf / iron troll /\
+ deep troll / cyclops / centaur / warg / wizard
KMONS: i = frost giant / fire giant
: else
KMONS: e = vampire / yaktaur / w:5 frost giant / w:5 fire giant /\
- ettin / orc / wolf / draconian / iron troll /\
- deep troll / cyclops / deep dwarf / centaur / warg / wizard
+ ettin / orc / wolf / iron troll /\
+ deep troll / cyclops / centaur / warg / wizard
KMONS: i = titan
: end
KMONS: P = plant
-KMONS: h = generate_awake human / generate_awake elf / generate_awake gnome
+KMONS: h = generate_awake human
: dgn.delayed_decay(_G, 'h', 'elf chunk / q:2 human chunk / q:2 gnome chunk')
KFEAT: = = floor
FTILE: =E79 = floor_grass
@@ -168,7 +168,7 @@ KFEAT: ~ = closed_door
SUBST: * = *:35 -:1
KITEM: - = animal skin
: dgn.delayed_decay_extra(_G, '*', 'human skeleton / yak skeleton /\
-: elf skeleton / gnome skeleton /\
+: elf skeleton w:20 /\
: elephant skeleton / sheep skeleton /\
: manticore skeleton', 'animal skin')
KFEAT: 8 = granite_statue / orcish_idol / w:5 altar_trog /\
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index 0465878..2ed4597 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -880,21 +880,21 @@ ENDMAP
NAME: hangedman_aviary
TAGS: no_rotate no_h_mirror
DEPTH: D:13-, Depths
-MONS: raven, tengu, harpy, phoenix
+MONS: raven, harpy, phoenix
: if you.absdepth() < 18 then
-SUBST: 3 = 1, 54 = 3
+SUBST: 2 = 1, 43 = 2
: else
SHUFFLE: wW / l'
-SUBST: ' = l, " = %*, 4 = 3, 5 = 4
+SUBST: ' = l, " = %*, 3 = 2, 4 = 3
: end
KMASK: wWl = no_monster_gen
MAP
cccccccWW.@@.WWccccccc
-c54..2ccW.xx.Wcc2..45c
-cc3ww.%c......c%.ww3cc
+c43..1ccW.xx.Wcc1..34c
+cc2ww.%c......c%.ww2cc
c*.ww1cc....cc1ww.*c
cc*.w1........1w.*cc
- cc"2.cc.xx.cc.2"cc
+ cc"1.cc.xx.cc.1"cc
cccccW.@@.Wccccc
ENDMAP
@@ -1366,7 +1366,7 @@ KMONS: 1 = kobold ; nothing
SUBST: . = e f .:150
: dgn.delayed_decay(_G, 'e', 'rat skeleton')
: dgn.delayed_decay(_G, 'f', 'giant gecko skeleton')
-KMONS: 5 = halfling att:neutral
+KMONS: 5 = hound att:neutral
KFEAT: m = iron_grate
MARKER: P = lua:fog_machine { cloud_type = "flame", \
pow_min = 10000, pow_max = 10000, delay = 1, \
@@ -1643,24 +1643,6 @@ MAP
.............
ENDMAP
-NAME: tengu_band
-DEPTH: D:9-, Shoals, Swamp
-TAGS: no_pool_fixup
-MONS: tengu
-MONS: tengu ; war axe / tengu ; long sword / tengu ; scimitar
-: if you.branch() == "Swamp" then
-KFEAT: t = mangrove
-: end
-MAP
- .........
-..wwwww.1..
-.wwttwww.2.
-.wtt2.tww..
-.wwwt.2....
-..wwwwww2..
- .........
-ENDMAP
-
NAME: minmay_rotating_lava
TAGS: no_monster_gen
DEPTH: D:10-
@@ -5270,8 +5252,8 @@ SUBST: k = KLMNO
: end
KMONS: A = Blork the orc / human; long sword | falchion . chain mail . shield
KMONS: B = human / human; great sword . chain mail|plate armour
-KMONS: C = Urug / elf; cutlass | long sword . leather armour . buckler | nothing
-KMONS: D = Joseph / elf; long sword | scimitar . chain mail . shield
+KMONS: C = Urug / human; cutlass | long sword . leather armour . buckler | nothing
+KMONS: D = Joseph / human; long sword | scimitar . chain mail . shield
KMONS: E = Erica / orc knight
KMONS: F = Harold / orc knight
KMONS: G = Donald / hell knight
--
1.8.3.2
|