Update update_apart to update scorn apartments.

Update peterm maps so that players can't as easily avoid the
draining runes.
Add some test maps I have used.
MSW 2003-02-24


git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2043 282e977c-c81d-0410-88c4-b93c2d0d6712

Info/update_apart.pl

@@ -216,6 +216,7 @@ $NEW_MAP_NAME[14]="/world/world_100_116";
 $NEW_MAP_OFFX[14]=16;
 $NEW_MAP_OFFY[14]=6;
 
+
 $VERBOSE=0;
 $error=0;
 for ($i=0; $i<=$#OLD_MAP_NAME; $i++) {
@@ -346,6 +347,10 @@ sub updatemap {
 			$made_change=1;
 		    }
 		}
+		elsif (m#\nslaying /city/apartment#) {
+			s#/city/apartment#/scorn/apartment#;
+			$made_change=1;
+		}
 	    }
 	    print OUT $_;
 	} # else not an object with inventory

quests/peterm/Demonology/AirMaster

@@ -5,8 +5,8 @@ Creator: peterm
 Email: peterm@soda.berkeley.edu
 Date: Sat Apr 30 20:50:08 1994
 endmsg
-x 9
-y 9
+width 9
+height 9
 end
 arch woodfloor
 end
@@ -256,6 +256,7 @@ y 3
 end
 arch wizard
 name Air Master
+type 0
 Str 0
 Con 6
 Wis 30
@@ -267,16 +268,15 @@ maxsp 140
 exp 18000
 dam 20
 ac 2
-x 4
-y 3
 speed 0.400000
 attack_movement 7
 level 30
-type 0
 resist_electricity 100
 carrying 100
 monster 1
 can_cast_spell 1
+x 4
+y 3
 arch ability_paralyze
 end
 arch ability_lightning
@@ -403,10 +403,22 @@ arch woodfloor
 x 6
 y 5
 end
+arch rune_drain_magic
+hp 20
+maxhp 999
+x 6
+y 6
+end
 arch woodfloor
 x 6
 y 6
 end
+arch rune_drain_magic
+hp 20
+maxhp 999
+x 6
+y 7
+end
 arch woodfloor
 x 6
 y 7
@@ -457,14 +469,15 @@ arch woodfloor
 x 7
 y 5
 end
-arch woodfloor
+arch rune_drain_magic
+hp 20
+maxhp 999
 x 7
 y 6
 end
-arch rune_drain_magic
-maxhp 99
+arch woodfloor
 x 7
-y 7
+y 6
 end
 arch woodfloor
 x 7
@@ -477,6 +490,10 @@ sp 7
 x 7
 y 7
 end
+arch dungeon_magic
+x 7
+y 7
+end
 arch woodfloor
 x 7
 y 8

quests/peterm/Demonology/EarthMaster

@@ -5,8 +5,8 @@ Creator: peterm
 Email: peterm@soda.berkeley.edu
 Date: Sat Apr 30 20:50:08 1994
 endmsg
-x 9
-y 9
+width 9
+height 9
 end
 arch woodfloor
 end
@@ -256,6 +256,7 @@ y 3
 end
 arch wizard
 name Master Earth Summoner
+type 0
 Str 0
 Dex 0
 Con 6
@@ -268,16 +269,15 @@ maxsp 140
 exp 18000
 dam 20
 ac 2
-x 4
-y 3
 speed 0.320000
 attack_movement 7
 level 30
-type 0
 immune 16
 carrying 100
 monster 1
 can_cast_spell 1
+x 4
+y 3
 arch ability_summon_earth
 end
 arch key2
@@ -406,10 +406,22 @@ arch woodfloor
 x 6
 y 5
 end
+arch rune_drain_magic
+hp 20
+maxhp 999
+x 6
+y 6
+end
 arch woodfloor
 x 6
 y 6
 end
+arch rune_drain_magic
+hp 20
+maxhp 999
+x 6
+y 7
+end
 arch woodfloor
 x 6
 y 7
@@ -460,15 +472,15 @@ arch woodfloor
 x 7
 y 5
 end
-arch woodfloor
-x 7
-y 6
-end
 arch rune_drain_magic
 hp 20
 maxhp 999
 x 7
-y 7
+y 6
+end
+arch woodfloor
+x 7
+y 6
 end
 arch woodfloor
 x 7
@@ -481,6 +493,10 @@ sp 7
 x 7
 y 7
 end
+arch dungeon_magic
+x 7
+y 7
+end
 arch woodfloor
 x 7
 y 8

quests/peterm/Demonology/FireMaster

@@ -5,8 +5,8 @@ Creator: peterm
 Email: peterm@soda.berkeley.edu
 Date: Sat Apr 30 20:50:08 1994
 endmsg
-x 9
-y 9
+width 9
+height 9
 end
 arch woodfloor
 end
@@ -260,6 +260,7 @@ y 4
 end
 arch wizard
 name Master Fire Summoner
+type 0
 Str 0
 Dex 0
 Con 6
@@ -272,16 +273,15 @@ maxsp 140
 exp 24000
 dam 20
 ac 0
-x 4
-y 4
 speed 0.400000
 attack_movement 7
 level 30
-type 0
 immune 4
 carrying 100
 monster 1
 can_cast_spell 1
+x 4
+y 4
 arch ability_summon_fire
 end
 arch key2
@@ -400,10 +400,22 @@ arch woodfloor
 x 6
 y 5
 end
+arch rune_drain_magic
+hp 20
+maxhp 999
+x 6
+y 6
+end
 arch woodfloor
 x 6
 y 6
 end
+arch rune_drain_magic
+hp 20
+maxhp 999
+x 6
+y 7
+end
 arch woodfloor
 x 6
 y 7
@@ -454,14 +466,15 @@ arch woodfloor
 x 7
 y 5
 end
-arch woodfloor
+arch rune_drain_magic
+hp 20
+maxhp 999
 x 7
 y 6
 end
-arch rune_drain_magic
-maxhp 999
+arch woodfloor
 x 7
-y 7
+y 6
 end
 arch woodfloor
 x 7
@@ -474,6 +487,10 @@ sp 7
 x 7
 y 7
 end
+arch dungeon_magic
+x 7
+y 7
+end
 arch woodfloor
 x 7
 y 8

quests/peterm/Demonology/WaterMaster

@@ -5,8 +5,8 @@ Creator: peterm
 Email: peterm@soda.berkeley.edu
 Date: Sat Apr 30 20:50:08 1994
 endmsg
-x 9
-y 9
+width 9
+height 9
 end
 arch woodfloor
 end
@@ -256,6 +256,7 @@ y 3
 end
 arch wizard
 name Master Water Summoner
+type 0
 Str 0
 Dex 0
 Con 6
@@ -268,16 +269,15 @@ maxsp 140
 exp 18000
 dam 20
 ac 2
-x 4
-y 3
 speed 0.400000
 attack_movement 7
 level 30
-type 0
 immune 64
 carrying 100
 monster 1
 can_cast_spell 1
+x 4
+y 3
 arch ability_summon_water
 end
 arch key2
@@ -402,10 +402,22 @@ arch woodfloor
 x 6
 y 5
 end
+arch rune_drain_magic
+hp 20
+maxhp 999
+x 6
+y 6
+end
 arch woodfloor
 x 6
 y 6
 end
+arch rune_drain_magic
+hp 20
+maxhp 999
+x 6
+y 7
+end
 arch woodfloor
 x 6
 y 7
@@ -456,14 +468,15 @@ arch woodfloor
 x 7
 y 5
 end
-arch woodfloor
+arch rune_drain_magic
+hp 20
+maxhp 999
 x 7
 y 6
 end
-arch rune_drain_magic
-hp 999
+arch woodfloor
 x 7
-y 7
+y 6
 end
 arch woodfloor
 x 7
@@ -476,6 +489,10 @@ sp 7
 x 7
 y 7
 end
+arch dungeon_magic
+x 7
+y 7
+end
 arch woodfloor
 x 7
 y 8