Reformat flags in *.txt files to be more tool-friendly

This means we have a *lot* of added lines, but on the upside
it's much simpler to use simple text-based tools and we get
rid of a lot of purely boilerplate code

1 files changed, 295 insertions, 102 deletions

diff --git a/lib/mods/theme/edit/d_info.txt b/lib/mods/theme/edit/d_info.txt
index bfdf6142..149c2a73 100644
--- a/lib/mods/theme/edit/d_info.txt
+++ b/lib/mods/theme/edit/d_info.txt
@@ -37,7 +37,9 @@ W:0:0:0:14:500
 L:89:80:199:20:1:0
 A:96:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | FLAT | NO_RECALL
+F:FLAT
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 ### The principal dungeons, they were created by spliting the vanilla dungeon ###
@@ -48,8 +50,11 @@ W:11:33:5:14:160
 L:89:95:199:5:88:0
 A:96:100:97:0:56:0:202:96
 O:20:20:20:20
-F:PRINCIPAL | NO_DOORS | NO_DESTROY | FLAT
 F:FILL_METHOD_0
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:PRINCIPAL
 R:100:0
 
 N:2:Barad-Dur
@@ -60,8 +65,12 @@ L:0:100:0
 A:97:50:56:50:56:0:57:97
 A:0:100:0
 O:20:20:20:20
-F:PRINCIPAL | LAVA_RIVER | CAVERN | NO_STREAMERS
-F:FILL_METHOD_2 | NO_RECALL
+F:CAVERN
+F:FILL_METHOD_2
+F:LAVA_RIVER
+F:NO_RECALL
+F:NO_STREAMERS
+F:PRINCIPAL
 R:100:0
 
 N:3:Angband
@@ -70,9 +79,13 @@ W:67:100:30:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:PRINCIPAL | CAVERN | NO_EASY_MOVE | NO_RECALL
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:CAVERN
 F:FILL_METHOD_0
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:PRINCIPAL
 R:100:0
 
 N:4:Barrow-Downs
@@ -84,8 +97,9 @@ L:88:78:89:18:199:4
 A:96:80:97:19:57:1:57:97
 A:100:0:0
 O:20:20:20:20
-F:PRINCIPAL | FLAT
 F:FILL_METHOD_3
+F:FLAT
+F:PRINCIPAL
 R:25:1
 M:UNDEAD
 R:75:0
@@ -101,8 +115,12 @@ L:86:90:205:10:1:0
 A:177:100:0:0:0:0:85:87
 O:10:10:30:30
 E:2d10:10:FIRE
-F:CAVE | LAVA_RIVER | NO_RECALL | NO_STREAMERS
-F:FILL_METHOD_0 | NO_EASY_MOVE
+F:CAVE
+F:FILL_METHOD_0
+F:LAVA_RIVER
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_STREAMERS
 R:100:1
 M:IM_FIRE
 
@@ -117,13 +135,25 @@ A:85:80:87:20:87:0:57:85
 A:50:50:0
 O:25:25:25:25
 E:10d10:3:NETHER
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_SHAFT
-F:ADJUST_LEVEL_2 | NO_RECALL | NO_STREAMERS
-F:LAVA_RIVER | FINAL_GUARDIAN_1032 | FINAL_ARTIFACT_203
-F:FILL_METHOD_2 | NO_RECALL_OUT
+F:ADJUST_LEVEL_2
+F:EMPTY
+F:FILL_METHOD_2
+F:FINAL_ARTIFACT_203
+F:FINAL_GUARDIAN_1032
+F:FORGET
+F:LAVA_RIVER
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
 R:5:0
 R:95:3
-M:RES_NETH | R_CHAR_G | R_CHAR_W | R_CHAR_U
+M:RES_NETH
+M:R_CHAR_G
+M:R_CHAR_U
+M:R_CHAR_W
 
 # The Lost Land of Numenor
 # levels 35-50
@@ -136,12 +166,16 @@ A:187:80:84:10:56:10:57:187
 A:60:0:40
 O:30:30:10:10
 E:1d1:1:ACID
+F:FILL_METHOD_3
+F:FINAL_ARTIFACT_204
+F:FINAL_GUARDIAN_980
 F:NO_STREAMERS
-F:FINAL_GUARDIAN_980 | FINAL_ARTIFACT_204
-F:FILL_METHOD_3 | WATER_BREATH
+F:WATER_BREATH
 R:20:0
 R:80:3
-M:AQUATIC | CAN_SWIM | CAN_FLY
+M:AQUATIC
+M:CAN_FLY
+M:CAN_SWIM
 
 # Used for astral mode
 N:8:Halls of Waiting
@@ -150,8 +184,10 @@ W:1:98:1:14:160
 L:1:100:1:0:1:0
 O:20:20:20:20
 A:56:100:56:0:56:0:57:58
-F:RANDOM_TOWNS | NO_RECALL | NO_SHAFT
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_SHAFT
+F:RANDOM_TOWNS
 R:100:2
 M:UNIQUE
 
@@ -166,16 +202,22 @@ L:87:5:88:65:16:30
 A:97:90:16:10:56:0:16:58
 O:30:30:30:10
 E:4d4:20:POISON
-F:FINAL_GUARDIAN_481
-F:RANDOM_TOWNS | CIRCULAR_ROOMS
+F:CIRCULAR_ROOMS
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_481
 F:FORCE_DOWN
+F:RANDOM_TOWNS
 F:WILD_65_56__67_53
 R:2:0
 R:49:3
-M:SPIDER | R_CHAR_a | R_CHAR_I | 
+M:R_CHAR_I
+M:R_CHAR_a
+M:SPIDER
 R:49:3
-M:ORC | R_CHAR_w | R_CHAR_m | R_CHAR_j
+M:ORC
+M:R_CHAR_j
+M:R_CHAR_m
+M:R_CHAR_w
 
 # The Heart of the Earth
 # levels 25-36
@@ -187,11 +229,19 @@ L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:40:10:10:20
 G:life
-F:EVOLVE | FINAL_GUARDIAN_1035 | NO_RECALL | NO_SHAFT
+F:EVOLVE
+F:FINAL_GUARDIAN_1035
+F:NO_RECALL
+F:NO_SHAFT
 R:40:3
-M:R_CHAR_# | R_CHAR_X | R_CHAR_g | R_CHAR_E | 
+M:R_CHAR_#
+M:R_CHAR_E
+M:R_CHAR_X
+M:R_CHAR_g
 R:30:3
-M:PASS_WALL | KILL_WALL | HURT_ROCK
+M:HURT_ROCK
+M:KILL_WALL
+M:PASS_WALL
 R:30:0
 
 # The Void
@@ -205,13 +255,25 @@ A:183:90:102:10:0:0:102:102
 A:40:60:0
 O:25:25:25:25
 E:20d6:100:DARK
-F:EMPTY | FORGET | NO_BREATH | NO_EASY_MOVE | NO_RECALL_OUT | NO_RECALL |
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:EMPTY
 F:FILL_METHOD_2
-F:FINAL_GUARDIAN_1044 |
+F:FINAL_GUARDIAN_1044
+F:FORGET
+F:NO_BREATH
+F:NO_EASY_MOVE
+F:NO_RECALL
+F:NO_RECALL_OUT
+F:NO_SHAFT
+F:NO_STREAMERS
 R:1:0
 R:99:3
-M:UNDEAD | DEMON | DRAGON | NONLIVING | SPIRIT
+M:DEMON
+M:DRAGON
+M:NONLIVING
+M:SPIRIT
+M:UNDEAD
 
 # TEST dungeon
 N:12:Test
@@ -222,7 +284,8 @@ L:0:95:5
 A:177:100:0:0:0:0:85:87
 A:100:0:0
 O:20:20:20:20
-F:FILL_METHOD_3 | SMALL
+F:FILL_METHOD_3
+F:SMALL
 R:100:0
 G:dungeon2
 
@@ -237,13 +300,15 @@ L:88:85:84:15:1:0
 A:56:75:87:25:56:0:57:58
 O:30:30:30:2
 E:1d1:20:RAISE
-F:FINAL_GUARDIAN_804 | FINAL_ARTIFACT_91
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_91
+F:FINAL_GUARDIAN_804
 R:5:0
 R:10:3
 M:R_CHAR_p
 R:85:3
-M:UNDEAD | NONLIVING
+M:NONLIVING
+M:UNDEAD
 
 # The Illusory Castle
 # levels 35-52
@@ -255,14 +320,31 @@ L:1:98:188:2:1:0
 A:56:50:189:50:56:0:57:58
 O:50:10:20:20
 E:6d2:6:CONFUSION
-F:RANDOM_TOWNS | NO_STREAMERS
-F:FINAL_GUARDIAN_1033 | FINAL_ARTIFACT_160
 F:FILL_METHOD_1
+F:FINAL_ARTIFACT_160
+F:FINAL_GUARDIAN_1033
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:0
 R:70:3
-M:STUPID | WEIRD_MIND | SHAPECHANGER | ATTR_MULTI | CHAR_MULTI | RAND_25 |
-M:RAND_50 | EMPTY_MIND | INVISIBLE | PASS_WALL | KILL_WALL
-S:BR_CONF | BR_CHAO | BA_CHAO | CONF | FORGET | TRAPS | MULTIPLY
+M:ATTR_MULTI
+M:CHAR_MULTI
+M:EMPTY_MIND
+M:INVISIBLE
+M:KILL_WALL
+M:PASS_WALL
+M:RAND_25
+M:RAND_50
+M:SHAPECHANGER
+M:STUPID
+M:WEIRD_MIND
+S:BA_CHAO
+S:BR_CHAO
+S:BR_CONF
+S:CONF
+S:FORGET
+S:MULTIPLY
+S:TRAPS
 
 # The Maze
 # Levels 25-37
@@ -274,8 +356,10 @@ L:1:100:1:0:1:0
 A:56:98:48:2:56:0:57:58
 O:2:40:10:40
 G:maze
-F:SMALLEST | FORGET
-F:FINAL_GUARDIAN_1029 | FINAL_ARTIFACT_38
+F:FINAL_ARTIFACT_38
+F:FINAL_GUARDIAN_1029
+F:FORGET
+F:SMALLEST
 R:80:0
 R:20:3
 M:R_CHAR_p
@@ -289,16 +373,20 @@ W:10:22:8:35:200
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:5:50:10:25
-F:RANDOM_TOWNS | 
-F:FINAL_OBJECT_810 | FINAL_GUARDIAN_373 | CAVE |
+F:CAVE
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_373
+F:FINAL_OBJECT_810
 F:FORCE_DOWN
+F:RANDOM_TOWNS
 F:WILD_49_21__51_19
 R:30:3
 M:TROLL
 R:20:0
 R:50:3
-M:ORC | R_CHAR_o | R_CHAR_O
+M:ORC
+M:R_CHAR_O
+M:R_CHAR_o
 
 # Erebor
 # levels 60-72
@@ -309,14 +397,22 @@ W:60:72:30:20:140
 L:88:100:1:0:1:0
 A:97:90:87:10:56:0:57:97
 O:40:40:40:40
-F:BIG | LAVA_RIVER | CAVERN | NO_RECALL | NO_STREAMERS
-F:CAVE | DOUBLE | FINAL_GUARDIAN_715 | 
+F:BIG
+F:CAVE
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_715
+F:LAVA_RIVER
+F:NO_RECALL
+F:NO_STREAMERS
 R:10:0
 R:60:1
-M:DRAGON | R_CHAR_D
+M:DRAGON
+M:R_CHAR_D
 R:30:1
-M:DRAGON | R_CHAR_d
+M:DRAGON
+M:R_CHAR_d
 
 # The Old Forest
 # levels 13-25
@@ -328,14 +424,21 @@ L:88:76:84:16:199:8
 L:68:16:16
 A:96:100:56:0:56:0:202:96
 O:20:5:15:30
-F:WATER_RIVERS | NO_DOORS | NO_DESTROY | FLAT | NO_STREAMERS
-F:RANDOM_TOWNS | FINAL_GUARDIAN_206
 F:FILL_METHOD_3
+F:FINAL_GUARDIAN_206
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_STREAMERS
+F:RANDOM_TOWNS
+F:WATER_RIVERS
 R:30:0
 R:40:3
-M:ANIMAL 
+M:ANIMAL
 R:30:3
-M:UNDEAD | R_CHAR_h | R_CHAR_l
+M:R_CHAR_h
+M:R_CHAR_l
+M:UNDEAD
 
 # The Mines of Moria
 # levels 30-50
@@ -346,15 +449,18 @@ W:30:50:20:40:40
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:30:50:10:5
-F:FINAL_GUARDIAN_872 | WATER_RIVER | NO_STREAMERS
+F:FILL_METHOD_0
+F:FINAL_GUARDIAN_872
 F:FORCE_DOWN
+F:NO_STREAMERS
 F:RANDOM_TOWNS
+F:WATER_RIVER
 F:WILD_45_30__44_37
-F:FILL_METHOD_0
 R:40:3
 M:ORC
 R:30:3
-M:TROLL | GIANT
+M:GIANT
+M:TROLL
 R:20:3
 M:DEMON
 R:10:0
@@ -368,16 +474,21 @@ W:57:70:34:24:160
 L:1:80:174:20:1:0
 A:56:100:56:0:56:0:57:58
 O:20:1:70:9
-F:SMALL | FINAL_GUARDIAN_819 | FINAL_ARTIFACT_205
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_205
+F:FINAL_GUARDIAN_819
+F:SMALL
 R:30:3
-M:R_CHAR_p | R_CHAR_P
+M:R_CHAR_P
+M:R_CHAR_p
 R:10:3
-M:ORC | TROLL
+M:ORC
+M:TROLL
 R:20:3
 M:UNDEAD
 R:30:3
-M:DEMON | DRAGON
+M:DEMON
+M:DRAGON
 R:10:0
 
 # Dungeons from Variaz
@@ -392,8 +503,9 @@ L:84:100:84:0:84:0
 A:97:100:56:0:56:0:57:58
 O:10:10:30:30
 E:1d1:20:ACID
-F:FINAL_GUARDIAN_517 | NO_RECALL
 F:FILL_METHOD_0
+F:FINAL_GUARDIAN_517
+F:NO_RECALL
 R:10:0
 R:10:3
 M:AQUATIC
@@ -413,9 +525,12 @@ W:45:70:20:14:160
 L:89:100:89:0:89:0
 A:97:100:56:0:56:0:97:97
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS
-F:FINAL_GUARDIAN_789 | FINAL_ARTIFACT_193
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_193
+F:FINAL_GUARDIAN_789
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:60:3
 M:CAN_FLY
 R:40:0
@@ -429,10 +544,15 @@ W:26:40:15:14:160
 L:89:100:1:0:1:0
 A:89:50:96:25:84:25:57:58
 O:20:20:20:20
-F:RANDOM_TOWNS | FLAT | NO_STREAMERS | FINAL_GUARDIAN_990
 F:FILL_METHOD_1
+F:FINAL_GUARDIAN_990
+F:FLAT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 R:30:3
-M:R_CHAR_p | R_CHAR_h | R_CHAR_l 
+M:R_CHAR_h
+M:R_CHAR_l
+M:R_CHAR_p
 R:30:3
 M:ANIMAL
 R:40:0
@@ -446,9 +566,11 @@ W:22:30:12:5:200
 L:91:85:94:10:93:5
 A:98:100:96:0:84:0:94:94
 O:15:5:60:20
-F:NO_DOORS | SAND_VEIN |
-F:FINAL_GUARDIAN_1030 | FINAL_ARTIFACT_153
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_153
+F:FINAL_GUARDIAN_1030
+F:NO_DOORS
+F:SAND_VEIN
 R:100:1
 M:R_CHAR_w
 R:10:3
@@ -461,8 +583,11 @@ W:1:1:1:30:255
 L:1:100:1:0:1:0
 A:1:100:1:0:1:0:1:1
 O:1:1:1:1
-F:EMPTY | SMALLEST | NO_RECALL | NO_STREAMERS
+F:EMPTY
 F:FILL_METHOD_0
+F:NO_RECALL
+F:NO_STREAMERS
+F:SMALLEST
 R:100:0
 
 # The Grinding Ice
@@ -477,9 +602,12 @@ A:95:0:56:100:56:0:57:58
 A:100:0:0
 O:20:20:20:20
 E:1d4:15:COLD
-F:DOUBLE | WATER_RIVER | CAVERN | NO_STREAMERS
-F:FINAL_GUARDIAN_1034 | 
+F:CAVERN
+F:DOUBLE
 F:FILL_METHOD_2
+F:FINAL_GUARDIAN_1034
+F:NO_STREAMERS
+F:WATER_RIVER
 R:100:1
 M:IM_COLD
 
@@ -493,7 +621,8 @@ W:1:50:1:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:FILL_METHOD_4 | NO_RECALL
+F:FILL_METHOD_4
+F:NO_RECALL
 R:100:0
 
 ### New dungeons added for Theme module ###
@@ -512,12 +641,22 @@ A:90:20:93:40:88:40:88:211
 O:20:20:20:20
 # it is always dark here in the northern wastelands
 E:2d4:1:DARK
-F:NO_DOORS | CAVERN | COLD | NO_DESTROY | EMPTY | FLAT | 
-F:NO_RECALL | LIFE_LEVEL | NO_STREAMERS | NO_SHAFT | 
-F:FINAL_GUARDIAN_389 | 
+F:CAVERN
+F:COLD
+F:EMPTY
 F:FILL_METHOD_4
+F:FINAL_GUARDIAN_389
+F:FLAT
+F:LIFE_LEVEL
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_RECALL
+F:NO_SHAFT
+F:NO_STREAMERS
 R:100:3
-M:COLD_BLOOD | HURT_LITE | IM_COLD
+M:COLD_BLOOD
+M:HURT_LITE
+M:IM_COLD
 
 # Emyn Luin
 # levels 60-70
@@ -531,13 +670,20 @@ L:89:45:81:5:88:50
 A:215:100:215:0:215:0:56:211
 # lots of treasure, not much magic
 O:50:20:10:30
-F:CAVE | CAVERN | CIRCULAR_ROOMS | RANDOM_TOWNS | 
-F:NO_STREAMERS | NO_RECALL | NO_DESTROY 
+F:CAVE
+F:CAVERN
+F:CIRCULAR_ROOMS
+F:NO_DESTROY
+F:NO_RECALL
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 # no_recall because it should not be so easy to get Nauglamir. :P
-F:FINAL_GUARDIAN_457 | FINAL_ARTIFACT_6 
 F:FILL_METHOD_3
+F:FINAL_ARTIFACT_6
+F:FINAL_GUARDIAN_457
 R:100:0
-M:R_CHAR_k | R_CHAR_o
+M:R_CHAR_k
+M:R_CHAR_o
 
 #Dol Amroth - Castle of Prince Imrahil
 #levels 25-35
@@ -549,14 +695,23 @@ W:25:35:15:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:SMALLEST | NO_DESTROY | TOWER | RANDOM_TOWNS | 
-F:ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT | NO_STAIR | 
-F:NO_EASY_MOVE | FILL_METHOD_2 
-F:FINAL_GUARDIAN_402 | 
+F:ADJUST_LEVEL_1
+F:FILL_METHOD_2
+F:FINAL_GUARDIAN_402
+F:NO_DESTROY
+F:NO_EASY_MOVE
+F:NO_SHAFT
+F:NO_STAIR
+F:NO_STREAMERS
+F:RANDOM_TOWNS
+F:SMALLEST
+F:TOWER
 R:80:3
-M:R_CHAR_p | R_CHAR_P 
+M:R_CHAR_P
+M:R_CHAR_p
 R:20:3
-M:SMART | TAKE_ITEM
+M:SMART
+M:TAKE_ITEM
 
 #Angmar
 #levels 80-90
@@ -571,13 +726,23 @@ A:214:100:214:0:214:0:214:214
 O:20:20:20:20
 # In addition to swamp water poison, we have disenchantment
 E:1d1:1:DISENCHANT
-F:ADJUST_LEVEL_1_2 | NO_DOORS | NO_STREAMERS | 
-F:HOT | FLAT | NO_SHAFT | NO_NEW_MONSTER | CIRCULAR_ROOMS | 
-F:FINAL_GUARDIAN_242 | FINAL_ARTIFACT_110
+F:ADJUST_LEVEL_1_2
+F:CIRCULAR_ROOMS
 F:FILL_METHOD_2
+F:FINAL_ARTIFACT_110
+F:FINAL_GUARDIAN_242
+F:FLAT
+F:HOT
+F:NO_DOORS
+F:NO_NEW_MONSTER
+F:NO_SHAFT
+F:NO_STREAMERS
 R:50:0
 R:50:3
-M:RES_DISE | UNDEAD | DEMON | NONLIVING 
+M:DEMON
+M:NONLIVING
+M:RES_DISE
+M:UNDEAD
 
 #Near Harad
 #levels 20-25
@@ -592,14 +757,24 @@ A:91:100:91:0:91:0:98:91
 O:20:20:20:20
 #Living is slow in the desert, heh :)
 E:1d1:1:INERTIA
-F:NO_DOORS | CAVE | CAVERN | HOT | NO_DESTROY | EMPTY | FLAT
-F:RANDOM_TOWNS | NO_STREAMERS | NO_SHAFT | 
-F:FINAL_GUARDIAN_395 | FINAL_ARTIFACT_171
-F:FILL_METHOD_4 
+F:CAVE
+F:CAVERN
+F:EMPTY
+F:FILL_METHOD_4
+F:FINAL_ARTIFACT_171
+F:FINAL_GUARDIAN_395
+F:FLAT
+F:HOT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_SHAFT
+F:NO_STREAMERS
+F:RANDOM_TOWNS
 #It's a desert (sort of wilderness) so WILD_TOO monsters, plus the 'p's for the Haradrim
 R:30:0
 R:70:3
-M:WILD_TOO | R_CHAR_p
+M:R_CHAR_p
+M:WILD_TOO
 
 #Isengard - Orc Cave on steroids.
 #levels 35-40 
@@ -611,13 +786,18 @@ W:35:40:20:14:160
 L:88:100:1:0:1:0
 A:97:100:56:0:56:0:57:97
 O:20:20:20:20
-F:CAVE | ADJUST_LEVEL_2 | NO_STREAMERS | 
+F:ADJUST_LEVEL_2
+F:CAVE
 F:FILL_METHOD_0
+F:NO_STREAMERS
 R:20:0
 R:30:3
-M:TROLL | R_CHAR_T | 
+M:R_CHAR_T
+M:TROLL
 R:50:3
-M:ORC | R_CHAR_o | R_CHAR_O
+M:ORC
+M:R_CHAR_O
+M:R_CHAR_o
 
 # Tol Eressea - of course you never actually set foot on Tol Eressea ;)
 # levels 40-45
@@ -631,10 +811,18 @@ L:84:60:222:40:222:0
 A:211:100:211:0:211:0:211:211
 # As little loot as possible, this is open water, after all
 O:1:1:1:1
-F:SMALLEST | NO_DOORS | NO_DESTROY | EMPTY | FLAT | 
-F:ADJUST_LEVEL_1 | NO_STREAMERS | NO_SHAFT | NO_NEW_MONSTER | 
-F:FINAL_GUARDIAN_791 | FINAL_ARTIFACT_219 | 
+F:ADJUST_LEVEL_1
+F:EMPTY
 F:FILL_METHOD_0
+F:FINAL_ARTIFACT_219
+F:FINAL_GUARDIAN_791
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
+F:NO_NEW_MONSTER
+F:NO_SHAFT
+F:NO_STREAMERS
+F:SMALLEST
 R:1:0
 R:99:1
 M:R_CHAR_B
@@ -648,9 +836,12 @@ W:101:127:30:14:160
 L:1:100:1:0:1:0
 A:56:100:56:0:56:0:57:58
 O:20:20:20:20
-F:CAVERN | NO_EASY_MOVE | NO_RECALL 
-F:ADJUST_LEVEL_1_2 | ADJUST_LEVEL_1 
-F:FILL_METHOD_0 
+F:ADJUST_LEVEL_1
+F:ADJUST_LEVEL_1_2
+F:CAVERN
+F:FILL_METHOD_0
+F:NO_EASY_MOVE
+F:NO_RECALL
 R:100:0
 
 # Bilbo's trail in the Barrow-downs
@@ -662,8 +853,8 @@ L:88:94:210:2:199:4
 A:96:80:97:19:57:1:57:97
 A:100:0:0
 O:20:20:20:20
-F:FLAT
 F:FILL_METHOD_3
+F:FLAT
 R:25:1
 M:UNDEAD
 R:75:0
@@ -676,8 +867,10 @@ W:33:33:15:14:160
 L:89:95:199:5:88:0
 A:96:100:97:0:56:0:202:96
 O:20:20:20:20
-F:NO_DOORS | NO_DESTROY | FLAT
 F:FILL_METHOD_0
+F:FLAT
+F:NO_DESTROY
+F:NO_DOORS
 R:100:0
 
 # N:<index>:<name>