Merge branch 'dwarven-update'

HallOfSelection

@@ -8,7 +8,7 @@ enter_x 7
 enter_y 5
 msg
 Created:  2000-10-12
-Modified: 2017-03-12 kts
+Modified: 2019-08-12 kts
 endmsg
 end
 arch blocked
@@ -856,6 +856,8 @@ y 16
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_warlock.111
+animation NONE
 hp 12
 sp 12
 x 3
@@ -881,6 +883,8 @@ y 18
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_sorcerer.111
+animation NONE
 hp 12
 sp 12
 x 3
@@ -906,6 +910,8 @@ y 20
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_sorcerer.111
+animation NONE
 hp 12
 sp 12
 x 3
@@ -931,6 +937,8 @@ y 22
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_sorcerer.111
+animation NONE
 hp 12
 sp 12
 x 3
@@ -957,6 +965,8 @@ y 24
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_sorcerer.111
+animation NONE
 hp 12
 sp 12
 x 3
@@ -982,6 +992,8 @@ y 26
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_sorcerer.111
+animation NONE
 hp 12
 sp 12
 x 3
@@ -1007,6 +1019,8 @@ y 28
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_devotee.111
+animation NONE
 hp 12
 sp 12
 x 3
@@ -1562,6 +1576,7 @@ Summoner
 You've had more of an emphasis on physical training than most spellcasters, at the expense of less practice with spellcasting.  You've never learned to use magic innately, but instead rely on a magic talisman to channel mana for you.
 Your work has leaned heavily toward the art of summoning creatures to help you in a fight, and your talisman has become attuned to that.  That attunement, however, makes it harder for you to reject unwanted creatures.
 You've also had a reasonable education in religious devotion.
+ o Attuned to the schools of Summoning and Creation
 endmsg
 x 5
 y 20
@@ -1654,6 +1669,7 @@ Your study of magic has been obsessive.  Your frequent practice has greatly enha
 Barbarians used to push you around on the street until you blasted one's leg off with a lightning bolt.  You reflected later on the stupidity of this, because you could by no means have blasted his friends, too.  Fortunately, they ran off.  You resolved to learn how to take out a whole group of barbarians before losing your temper again.
 On the other hand, you have totally neglected to learn to use weaponry, so you're soft and weak.
 Your study of magical devices allows you to notice when an object has a magical aura, and you are often able to fathom the purpose of magical devices.
+ o Attuned to the schools of Electricity and Fire
 endmsg
 x 5
 y 26
@@ -3136,6 +3152,7 @@ Monk
 In the Monastery, they believed in mental discipline and peace through physical training, meditation, and, to a lesser extent, religious devotion.
 Your mental equilibrium requires you to forego the use of weapons, but your physical training in karate means you're not helpless.
 Your inner peace grants you the ability to regenerate faster and to sense metaphysical auras.
+ o Attuned to the school of Protection
 endmsg
 x 9
 y 28
@@ -3196,6 +3213,7 @@ Priest
 As a priest, you've learned an intense devotion to your god, and you've learned how to channel the energies your god vouchsafes to his devotees.
 You've been taught the use of weapons, but only cursorily, and your physical training has been lacking in general.
 Since you're in tune with the holy powers, you can tell when a god has marked an object as accursed.
+ o Attuned to the schools of Restoration and Protection
 endmsg
 x 9
 y 32
@@ -3615,6 +3633,8 @@ y 16
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_warrior.111
+animation NONE
 hp 12
 sp 12
 x 11
@@ -3640,6 +3660,8 @@ y 18
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_warrior.111
+animation NONE
 hp 12
 sp 12
 x 11
@@ -3665,6 +3687,8 @@ y 20
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_ranger.111
+animation NONE
 hp 12
 sp 12
 x 11
@@ -3696,6 +3720,8 @@ y 22
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_assassin.111
+animation NONE
 hp 12
 sp 12
 x 11
@@ -3721,6 +3747,8 @@ y 24
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_assassin.111
+animation NONE
 hp 12
 sp 12
 x 11
@@ -3746,6 +3774,8 @@ y 26
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_assassin.111
+animation NONE
 hp 12
 sp 12
 x 11
@@ -3771,6 +3801,8 @@ y 28
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_paladin.111
+animation NONE
 hp 12
 sp 12
 x 11
@@ -3796,6 +3828,8 @@ y 30
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_paladin.111
+animation NONE
 hp 12
 sp 12
 x 11
@@ -3821,6 +3855,8 @@ y 32
 end
 arch player_changer
 slaying /start/Nexus
+face sigil_priest.111
+animation NONE
 hp 12
 sp 12
 x 11

world/world_104_116

@@ -4,7 +4,7 @@ region scorn
 width 50
 height 50
 msg
-Modified: 2008-10-30 Rick Tanner
+Modified: 2018-07-02 kts
 endmsg
 outdoor 1
 tile_path_1 world_104_115
@@ -11118,23 +11118,35 @@ end
 arch brush
 x 42
 y 4
-elevation 2912
+elevation 803
+end
+arch store_brew
+name Brewmaster Chen's
+slaying /scorn/shops/brewshop
+hp 6
+sp 18
+x 42
+y 4
 end
 arch dungeon_magic
 x 42
 y 5
-end
-arch brush
-x 42
-y 5
 elevation 4616
 end
+arch brush
+x 42
+y 5
+end
+arch light3
+x 42
+y 5
+end
 arch dungeon_magic
 x 42
 y 6
-elevation 14147
+elevation 13411
 end
-arch grass
+arch cobblestones2
 x 42
 y 6
 end