modified inn lighting (removed redundant lights)

added streetlights to Navar
fixed map tiling info for Navar and Scorn
finished up the river in Navar


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

inn_and_outpost/grumms_inn

@@ -137,10 +137,6 @@ arch brazier
 x 1
 y 2
 end
-arch light4
-x 1
-y 2
-end
 arch woodfloor2
 x 1
 y 3
@@ -165,10 +161,6 @@ arch brazier
 x 1
 y 7
 end
-arch light4
-x 1
-y 7
-end
 arch woodfloor2
 x 1
 y 8
@@ -453,6 +445,10 @@ friendly 1
 x 4
 y 5
 end
+arch light2
+x 4
+y 5
+end
 arch woodfloor2
 x 4
 y 6
@@ -586,10 +582,6 @@ arch brazier
 x 5
 y 10
 end
-arch light4
-x 5
-y 10
-end
 arch grass
 x 5
 y 11
@@ -719,10 +711,6 @@ arch brazier
 x 7
 y 2
 end
-arch light4
-x 7
-y 2
-end
 arch woodfloor2
 x 7
 y 3
@@ -847,10 +835,6 @@ arch brazier
 x 8
 y 7
 end
-arch light4
-x 8
-y 7
-end
 arch woodfloor2
 x 8
 y 8
@@ -961,10 +945,6 @@ arch brazier
 x 9
 y 10
 end
-arch light4
-x 9
-y 10
-end
 arch grass
 x 9
 y 11
@@ -1002,10 +982,6 @@ arch fireplace
 x 10
 y 1
 end
-arch light2
-x 10
-y 1
-end
 arch woodfloor2
 x 10
 y 2
@@ -1105,10 +1081,6 @@ arch fireplace
 x 11
 y 1
 end
-arch light2
-x 11
-y 1
-end
 arch woodfloor2
 x 11
 y 2
@@ -1154,6 +1126,10 @@ arch chair_1.1
 x 11
 y 5
 end
+arch light2
+x 11
+y 5
+end
 arch woodfloor2
 x 11
 y 6
@@ -1441,10 +1417,6 @@ arch brazier
 x 14
 y 2
 end
-arch light4
-x 14
-y 2
-end
 arch woodfloor2
 x 14
 y 3
@@ -1469,10 +1441,6 @@ arch brazier
 x 14
 y 7
 end
-arch light4
-x 14
-y 7
-end
 arch woodfloor2
 x 14
 y 8
@@ -1734,6 +1702,10 @@ arch chair_1.1
 x 17
 y 5
 end
+arch light2
+x 17
+y 5
+end
 arch woodfloor2
 x 17
 y 6
@@ -1985,10 +1957,6 @@ arch brazier
 x 20
 y 2
 end
-arch light4
-x 20
-y 2
-end
 arch woodfloor2
 x 20
 y 3
@@ -2040,10 +2008,6 @@ arch brazier
 x 20
 y 7
 end
-arch light4
-x 20
-y 7
-end
 arch woodfloor2
 x 20
 y 8

inn_and_outpost/grumms_inn2

@@ -100,11 +100,7 @@ arch woodfloor2
 x 1
 y 4
 end
-arch brazier
-x 1
-y 4
-end
-arch light3
+arch firepot
 x 1
 y 4
 end
@@ -112,11 +108,7 @@ arch woodfloor2
 x 1
 y 5
 end
-arch brazier
-x 1
-y 5
-end
-arch light3
+arch firepot
 x 1
 y 5
 end
@@ -242,6 +234,10 @@ arch table
 x 3
 y 1
 end
+arch light2
+x 3
+y 1
+end
 arch woodfloor2
 x 3
 y 2
@@ -282,6 +278,10 @@ arch table
 x 3
 y 8
 end
+arch light2
+x 3
+y 8
+end
 arch woodfloor2
 x 3
 y 9
@@ -456,14 +456,6 @@ arch woodfloor2
 x 6
 y 3
 end
-arch brazier
-x 6
-y 3
-end
-arch light3
-x 6
-y 3
-end
 arch woodfloor2
 x 6
 y 4
@@ -476,14 +468,6 @@ arch woodfloor2
 x 6
 y 6
 end
-arch brazier
-x 6
-y 6
-end
-arch light3
-x 6
-y 6
-end
 arch woodfloor2
 x 6
 y 7
@@ -534,6 +518,10 @@ arch woodfloor2
 x 7
 y 3
 end
+arch firepot
+x 7
+y 3
+end
 arch woodfloor2
 x 7
 y 4
@@ -546,6 +534,10 @@ arch woodfloor2
 x 7
 y 6
 end
+arch firepot
+x 7
+y 6
+end
 arch woodfloor2
 x 7
 y 7
@@ -792,6 +784,10 @@ arch woodfloor2
 x 11
 y 1
 end
+arch light2
+x 11
+y 1
+end
 arch woodfloor2
 x 11
 y 2
@@ -832,6 +828,10 @@ arch table
 x 11
 y 8
 end
+arch light2
+x 11
+y 8
+end
 arch woodfloor2
 x 11
 y 9
@@ -994,14 +994,6 @@ arch woodfloor2
 x 14
 y 3
 end
-arch brazier
-x 14
-y 3
-end
-arch light3
-x 14
-y 3
-end
 arch woodfloor2
 x 14
 y 4
@@ -1014,11 +1006,7 @@ arch woodfloor2
 x 14
 y 6
 end
-arch brazier
-x 14
-y 6
-end
-arch light3
+arch firepot
 x 14
 y 6
 end
@@ -1106,11 +1094,7 @@ arch woodfloor2
 x 16
 y 1
 end
-arch brazier
-x 16
-y 1
-end
-arch light2
+arch firepot
 x 16
 y 1
 end
@@ -1230,11 +1214,7 @@ arch woodfloor2
 x 18
 y 1
 end
-arch brazier
-x 18
-y 1
-end
-arch light2
+arch firepot
 x 18
 y 1
 end
@@ -1286,6 +1266,10 @@ arch table_2
 x 18
 y 8
 end
+arch light2
+x 18
+y 8
+end
 arch woodfloor2
 x 18
 y 9
@@ -1377,11 +1361,7 @@ arch woodfloor2
 x 20
 y 5
 end
-arch brazier
-x 20
-y 5
-end
-arch light3
+arch firepot
 x 20
 y 5
 end

inn_and_outpost/hermes_inn

@@ -125,10 +125,6 @@ arch brazier
 x 1
 y 2
 end
-arch light4
-x 1
-y 2
-end
 arch woodfloor2
 x 1
 y 3
@@ -158,10 +154,6 @@ arch brazier
 x 1
 y 6
 end
-arch light4
-x 1
-y 6
-end
 arch woodfloor2
 x 1
 y 7
@@ -514,10 +506,6 @@ arch fireplace
 x 5
 y 1
 end
-arch light4
-x 5
-y 1
-end
 arch woodfloor2
 x 5
 y 2
@@ -544,6 +532,10 @@ arch woodfloor2
 x 5
 y 5
 end
+arch light2
+x 5
+y 5
+end
 arch woodfloor2
 x 5
 y 6
@@ -568,10 +560,6 @@ arch brazier
 x 5
 y 8
 end
-arch light4
-x 5
-y 8
-end
 arch woodfloor2
 x 5
 y 9
@@ -588,10 +576,6 @@ arch brazier
 x 5
 y 10
 end
-arch light4
-x 5
-y 10
-end
 arch grass
 x 5
 y 11
@@ -912,10 +896,6 @@ arch brazier
 x 9
 y 2
 end
-arch light4
-x 9
-y 2
-end
 arch woodfloor2
 x 9
 y 3
@@ -977,10 +957,6 @@ arch brazier
 x 9
 y 10
 end
-arch light4
-x 9
-y 10
-end
 arch grass
 x 9
 y 11
@@ -1049,6 +1025,10 @@ arch chair_1.1
 x 10
 y 5
 end
+arch light2
+x 10
+y 5
+end
 arch woodfloor2
 x 10
 y 6
@@ -1243,10 +1223,6 @@ arch brazier
 x 12
 y 8
 end
-arch light4
-x 12
-y 8
-end
 arch woodfloor2
 x 12
 y 9
@@ -1296,10 +1272,6 @@ arch fireplace
 x 13
 y 1
 end
-arch light4
-x 13
-y 1
-end
 arch woodfloor2
 x 13
 y 2
@@ -1401,10 +1373,6 @@ arch brazier
 x 14
 y 4
 end
-arch light4
-x 14
-y 4
-end
 arch woodfloor2
 x 14
 y 5
@@ -1688,6 +1656,10 @@ damned 1
 x 17
 y 3
 end
+arch light2
+x 17
+y 3
+end
 arch woodfloor2
 x 17
 y 4
@@ -1959,10 +1931,6 @@ arch brazier
 x 20
 y 1
 end
-arch light4
-x 20
-y 1
-end
 arch woodfloor2
 x 20
 y 2
@@ -2008,10 +1976,6 @@ arch brazier
 x 20
 y 6
 end
-arch light4
-x 20
-y 6
-end
 arch woodfloor2
 x 20
 y 7
@@ -2272,8 +2236,28 @@ msg
 @match *
 Me not speak good, you say to Hermes.
 endmsg
+randomitems none
 exp 0
+dam 15
 friendly 1
+resist_physical 100
+resist_magic 100
+resist_fire 100
+resist_electricity 100
+resist_cold 100
+resist_acid 100
+resist_drain 100
+resist_weaponmagic 100
+resist_ghosthit 100
+resist_poison 100
+resist_deplete 100
+resist_chaos 100
+resist_holyword 100
+resist_godpower 100
 x 16
 y 10
+arch key2
+name key
+slaying Hermes Key
+end
 end

inn_and_outpost/hermes_inn2

@@ -7,6 +7,7 @@ Date:    10/27/2002
 endmsg
 width 22
 height 10
+difficulty 4
 outdoor 1
 end
 arch woodfloor2
@@ -97,10 +98,6 @@ arch brazier
 x 1
 y 4
 end
-arch light3
-x 1
-y 4
-end
 arch woodfloor2
 x 1
 y 5
@@ -109,10 +106,6 @@ arch brazier
 x 1
 y 5
 end
-arch light3
-x 1
-y 5
-end
 arch woodfloor2
 x 1
 y 6
@@ -317,10 +310,6 @@ arch brazier
 x 4
 y 3
 end
-arch light3
-x 4
-y 3
-end
 arch woodfloor2
 x 4
 y 4
@@ -337,10 +326,6 @@ arch brazier
 x 4
 y 6
 end
-arch light3
-x 4
-y 6
-end
 arch woodfloor2
 x 4
 y 7
@@ -607,10 +592,6 @@ arch brazier
 x 8
 y 3
 end
-arch light3
-x 8
-y 3
-end
 arch woodfloor2
 x 8
 y 4
@@ -627,10 +608,6 @@ arch brazier
 x 8
 y 6
 end
-arch light3
-x 8
-y 6
-end
 arch woodfloor2
 x 8
 y 7
@@ -909,10 +886,6 @@ arch brazier
 x 12
 y 6
 end
-arch light3
-x 12
-y 6
-end
 arch woodfloor2
 x 12
 y 7
@@ -950,6 +923,13 @@ end
 arch chest
 x 13
 y 1
+arch key2
+name greasy key
+msg
+This key is slightly greasy, like it has been oiled.
+endmsg
+slaying Hermes Stash Key
+end
 end
 arch woodfloor2
 x 13
@@ -967,10 +947,6 @@ arch fireplace
 x 13
 y 3
 end
-arch light3
-x 13
-y 3
-end
 arch woodfloor2
 x 13
 y 4
@@ -1037,6 +1013,10 @@ arch woodfloor2
 x 14
 y 3
 end
+arch brazier
+x 14
+y 3
+end
 arch woodfloor2
 x 14
 y 4
@@ -1163,6 +1143,10 @@ arch woodfloor2
 x 16
 y 2
 end
+arch random_wealth
+x 16
+y 2
+end
 arch woodfloor2
 x 16
 y 3
@@ -1249,10 +1233,6 @@ arch brazier
 x 17
 y 6
 end
-arch light3
-x 17
-y 6
-end
 arch woodfloor2
 x 17
 y 7
@@ -1265,6 +1245,10 @@ arch woodfloor2
 x 17
 y 8
 end
+arch random_food
+x 17
+y 8
+end
 arch barrel
 x 17
 y 8
@@ -1291,10 +1275,6 @@ arch brazier
 x 18
 y 1
 end
-arch light4
-x 18
-y 1
-end
 arch woodfloor2
 x 18
 y 2
@@ -1307,6 +1287,17 @@ arch woodwall_1_3
 x 18
 y 3
 end
+arch magic_mouth
+msg
+The key opens the door.
+endmsg
+connected 10
+walk_on 0
+fly_on 0
+food 1
+x 18
+y 3
+end
 arch woodfloor2
 x 18
 y 4
@@ -1353,6 +1344,10 @@ arch table_4
 x 19
 y 1
 end
+arch claypipe
+x 19
+y 1
+end
 arch woodfloor2
 x 19
 y 2
@@ -1373,6 +1368,7 @@ end
 arch check_inv
 slaying Hermes Key
 connected 10
+last_heal 1
 x 19
 y 4
 end
@@ -1439,10 +1435,6 @@ arch brazier
 x 20
 y 4
 end
-arch light3
-x 20
-y 4
-end
 arch woodfloor2
 x 20
 y 5

world/world_105_115

@@ -12,10 +12,10 @@ enter_y 1
 reset_timeout 7200
 difficulty 1
 outdoor 1
-tile_path_1 /world/world_105_114
-tile_path_2 /world/world_106_115
-tile_path_3 /world/world_105_116
-tile_path_4 /world/world_104_115
+tile_path_1 world_105_114
+tile_path_2 world_106_115
+tile_path_3 world_105_116
+tile_path_4 world_104_115
 end
 arch sea
 end

world/world_121_116

@@ -12,10 +12,10 @@ enter_y 1
 reset_timeout 7200
 difficulty 1
 outdoor 1
-tile_path_1 /world/world_121_115
-tile_path_2 /world/world_122_116
-tile_path_3 /world/world_121_117
-tile_path_4 /world/world_120_116
+tile_path_1 world_121_115
+tile_path_2 world_122_116
+tile_path_3 world_121_117
+tile_path_4 world_120_116
 end
 arch desert
 elevation 89
@@ -8143,33 +8143,36 @@ elevation 3324
 x 32
 y 41
 end
-arch mountain
-elevation 5603
+arch cobblestones
 x 32
 y 42
 end
-arch mountain
-elevation 5418
+arch cobblestones
 x 32
 y 43
 end
-arch mountain
-elevation 6481
+arch cobblestones
 x 32
 y 44
 end
-arch mountain
-elevation 6328
+arch cobblestones
 x 32
 y 45
 end
-arch mountain
-elevation 5807
+arch cobblestones
 x 32
 y 46
 end
-arch mountain
-elevation 5190
+arch sign
+msg
+Welcome to Navar City.
+To go to Darcap, take the road north 1065 miles.
+To go to Brest or Scorn, take the road south.
+endmsg
+x 32
+y 46
+end
+arch cobblestones
 x 32
 y 47
 end
@@ -8393,15 +8396,6 @@ arch cobblestones
 x 33
 y 46
 end
-arch sign
-msg
-Welcome to Navar City.
-To go to Darcap, take the road north 1065 miles.
-To go to Brest or Scorn, take the road south.
-endmsg
-x 33
-y 46
-end
 arch cobblestones
 x 33
 y 47
@@ -8613,6 +8607,10 @@ arch cobblestones
 x 34
 y 43
 end
+arch lamppost
+x 34
+y 43
+end
 arch cobblestones
 x 34
 y 44
@@ -8633,6 +8631,10 @@ arch cobblestones
 x 34
 y 48
 end
+arch lamppost
+x 34
+y 48
+end
 arch mountain
 elevation 5142
 x 34
@@ -9123,7 +9125,7 @@ arch cobblestones2
 x 36
 y 38
 end
-arch light4
+arch lamppost
 x 36
 y 38
 end
@@ -9930,10 +9932,6 @@ arch cobblestones2
 x 39
 y 46
 end
-arch light4
-x 39
-y 46
-end
 arch cobblestones2
 x 39
 y 47
@@ -10208,6 +10206,10 @@ arch grass
 x 40
 y 48
 end
+arch lamppost
+x 40
+y 48
+end
 arch cobblestones2
 x 40
 y 49
@@ -10424,6 +10426,10 @@ arch grass
 x 41
 y 42
 end
+arch lamppost
+x 41
+y 42
+end
 arch cobblestones2
 x 41
 y 43
@@ -11679,10 +11685,6 @@ arch cobblestones2
 x 46
 y 43
 end
-arch light4
-x 46
-y 43
-end
 arch cobblestones2
 x 46
 y 44
@@ -11931,6 +11933,10 @@ arch cobblestones
 x 47
 y 45
 end
+arch lamppost
+x 47
+y 45
+end
 arch cobblestones
 x 47
 y 46

world/world_122_116

@@ -1189,10 +1189,6 @@ arch cobblestones2
 x 4
 y 43
 end
-arch light4
-x 4
-y 43
-end
 arch grass
 x 4
 y 44
@@ -2207,6 +2203,10 @@ arch grass
 x 8
 y 42
 end
+arch lamppost
+x 8
+y 42
+end
 arch grass
 x 8
 y 43
@@ -3256,6 +3256,10 @@ arch brush
 x 12
 y 41
 end
+arch lamppost
+x 12
+y 41
+end
 arch grass
 x 12
 y 42
@@ -3524,10 +3528,6 @@ arch cobblestones2
 x 13
 y 41
 end
-arch light4
-x 13
-y 41
-end
 arch cobblestones2
 x 13
 y 42
@@ -3544,11 +3544,11 @@ arch grass
 x 13
 y 45
 end
-arch cobblestones2
+arch lamppost
 x 13
-y 46
+y 45
 end
-arch light4
+arch cobblestones2
 x 13
 y 46
 end