Use map tiling between pup_land/world and pup_land/rainbow/islands. Update exit references to reflect subsequent repositioning of map data.

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

ChangeLog

@@ -1,3 +1,17 @@
+2020-10-01  Daniel Hawkins
+	* pup_land/world: Add map tiling with rainbow/islands. Remove redundant tiles at south.
+	* pup_land/rainbow/islands: Add map tiling with pup_land/world. Remove redundant tiles at north and add sea tiles to west to align tiling.
+	* pup_land/jk/heads,
+	  pup_land/rainbow/l_h1,
+	  pup_land/rainbow/red_town/town,
+	  pup_land/rainbow/river,
+	  pup_land/rainbow/shore,
+	  pup_land/rainbow/well,
+	  pup_land/rainbow/woods,
+	  pup_land/s_f/ruin,
+	  pup_land/s_f/to-jyo: Update map exit references to rainbow/islands to reflect
+	      map repositioning.
+
 2020-09-01  Daniel Hawkins
     * python/items/lose_buffs_on_drop.py,
       python/events/gkill/sword_of_souls.py: Update to use TotalExp field over PermExp.

pup_land/jk/heads

@@ -6,7 +6,7 @@ width 23
 height 27
 msg
 Created:  1996-02-08
-Modified: 2012-04-05 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch cave_15
@@ -2292,8 +2292,8 @@ y 26
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 28
+hp 31
-sp 24
+sp 17
 x 15
 end
 arch medium_stones

pup_land/rainbow/l_h1

@@ -7,7 +7,7 @@ height 7
 enter_x 3
 msg
 Created:  1996-06-12
-Modified: 2008-10-28 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch blocked
@@ -127,8 +127,8 @@ y 6
 end
 arch invis_exit
 slaying islands
-hp 28
+hp 31
-sp 19
+sp 12
 x 3
 end
 arch cobblestones2

pup_land/rainbow/red_town/town

@@ -6,7 +6,7 @@ width 15
 height 15
 msg
 Created:  1997-02-11
-Modified: 2020-03-31 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch woods
@@ -670,8 +670,8 @@ y 13
 end
 arch invis_exit
 slaying ../islands
-hp 21
+hp 24
-sp 21
+sp 14
 x 7
 y 14
 end
@@ -1137,8 +1137,8 @@ move_block 0
 end
 arch galleon
 slaying ../islands
-hp 24
+hp 27
-sp 25
+sp 18
 x 13
 y 12
 end

pup_land/rainbow/river

@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1996-06-12
-Modified: 2008-10-13 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch dungeon_floor
@@ -2881,8 +2881,8 @@ end
 arch invis_exit
 slaying islands
 face sea.111
-hp 24
+hp 27
-sp 18
+sp 11
 x 42
 y 5
 invisible 0

pup_land/rainbow/shore

@@ -8,13 +8,13 @@ enter_x 7
 enter_y 1
 msg
 Created:  1996-06-08
-Modified: 2012-03-06 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 end
 arch grass
 end
@@ -95,8 +95,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 1
 end
 arch grass
@@ -203,8 +203,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 2
 end
 arch grass
@@ -332,8 +332,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 3
 end
 arch grass
@@ -449,8 +449,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 4
 end
 arch grass
@@ -575,8 +575,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 5
 end
 arch grass
@@ -685,8 +685,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 6
 end
 arch grass
@@ -795,8 +795,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 7
 end
 arch grass
@@ -927,8 +927,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 8
 end
 arch grass
@@ -1037,8 +1037,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 9
 end
 arch grass
@@ -1158,8 +1158,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 10
 end
 arch grass
@@ -1282,8 +1282,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 11
 end
 arch grass
@@ -1409,8 +1409,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 12
 end
 arch grass
@@ -1528,8 +1528,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 13
 end
 arch grass
@@ -1663,8 +1663,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 14
 end
 arch grass
@@ -1792,8 +1792,8 @@ y 19
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 21
+sp 14
 x 15
 end
 arch grass

pup_land/rainbow/station

@@ -8,7 +8,7 @@ enter_x 7
 enter_y 2
 msg
 Created:  1996-05-30
-Modified: 2016-06-25 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch pstone_1
@@ -750,8 +750,8 @@ y 14
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 18
+sp 11
 x 7
 y 15
 end
@@ -827,8 +827,8 @@ y 14
 end
 arch invis_exit
 slaying islands
-hp 17
+hp 20
-sp 18
+sp 11
 x 8
 y 15
 end

pup_land/rainbow/well

@@ -8,7 +8,7 @@ enter_x 3
 enter_y 2
 msg
 Created:  1996-08-13 K Yosida
-Modified: 2011-12-22 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch blocked
@@ -138,8 +138,8 @@ y 2
 end
 arch ladder_up
 slaying islands
-hp 18
+hp 21
-sp 15
+sp 8
 x 3
 y 2
 end

pup_land/s_f/ruin

@@ -8,20 +8,20 @@ enter_x 6
 enter_y 11
 msg
 Created:  1996-02-07
-Modified: 2012-04-11 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 end
 arch pstone_3
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 1
 end
 arch pstone_2
@@ -29,8 +29,8 @@ y 1
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 2
 end
 arch pstone_3
@@ -38,8 +38,8 @@ y 2
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 3
 end
 arch pstone_2
@@ -47,8 +47,8 @@ y 3
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 4
 end
 arch pstone_2
@@ -59,8 +59,8 @@ y 4
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 5
 end
 arch pstone_2
@@ -68,8 +68,8 @@ y 5
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 6
 end
 arch pstone_2
@@ -77,8 +77,8 @@ y 6
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 7
 end
 arch pstone_2
@@ -86,8 +86,8 @@ y 7
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 8
 end
 arch pstone_2
@@ -95,8 +95,8 @@ y 8
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 9
 end
 arch pstone_3
@@ -104,8 +104,8 @@ y 9
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 10
 end
 arch pstone_2
@@ -113,8 +113,8 @@ y 10
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 11
 end
 arch pstone_2
@@ -122,8 +122,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 y 12
 end
 arch pstone_1
@@ -131,8 +131,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 1
 end
 arch pstone_3
@@ -192,8 +192,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 1
 y 12
 end
@@ -203,8 +203,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 2
 end
 arch pstone_3
@@ -260,8 +260,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 2
 y 12
 end
@@ -271,8 +271,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 3
 end
 arch pstone_2
@@ -333,8 +333,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 3
 y 12
 end
@@ -344,8 +344,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 4
 end
 arch pstone_3
@@ -409,8 +409,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 4
 y 12
 end
@@ -420,8 +420,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 5
 end
 arch pstone_3
@@ -483,8 +483,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 5
 y 12
 end
@@ -494,8 +494,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 6
 end
 arch pstone_2
@@ -551,8 +551,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 6
 y 12
 end
@@ -562,8 +562,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 7
 end
 arch pstone_2
@@ -636,8 +636,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 7
 y 12
 end
@@ -647,8 +647,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 8
 end
 arch pstone_2
@@ -700,8 +700,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 8
 y 12
 end
@@ -711,8 +711,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 9
 end
 arch pstone_2
@@ -790,8 +790,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 9
 y 12
 end
@@ -801,8 +801,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 10
 end
 arch pstone_2
@@ -854,8 +854,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 10
 y 12
 end
@@ -865,8 +865,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 11
 end
 arch pstone_2
@@ -918,8 +918,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 11
 y 12
 end
@@ -929,8 +929,8 @@ y 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 end
 arch pstone_2
@@ -938,8 +938,8 @@ x 12
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 1
 end
@@ -949,8 +949,8 @@ y 1
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 2
 end
@@ -960,8 +960,8 @@ y 2
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 3
 end
@@ -971,8 +971,8 @@ y 3
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 4
 end
@@ -982,8 +982,8 @@ y 4
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 5
 end
@@ -993,8 +993,8 @@ y 5
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 6
 end
@@ -1004,8 +1004,8 @@ y 6
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 7
 end
@@ -1015,8 +1015,8 @@ y 7
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 8
 end
@@ -1026,8 +1026,8 @@ y 8
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 9
 end
@@ -1037,8 +1037,8 @@ y 9
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 10
 end
@@ -1048,8 +1048,8 @@ y 10
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 11
 end
@@ -1059,8 +1059,8 @@ y 11
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 19
+hp 22
-sp 27
+sp 20
 x 12
 y 12
 end

pup_land/s_f/to-jyo

@@ -8,7 +8,7 @@ enter_x 9
 enter_y 13
 msg
 Created:  1996-02-09
-Modified: 2012-04-11 Rick Tanner
+Modified: 2020-10-01 SilverNexus
 endmsg
 end
 arch sea
@@ -620,8 +620,8 @@ y 13
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 24
+hp 27
-sp 22
+sp 15
 x 6
 y 14
 end
@@ -706,8 +706,8 @@ y 14
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 24
+hp 27
-sp 22
+sp 15
 x 7
 y 14
 end
@@ -826,8 +826,8 @@ y 13
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 24
+hp 27
-sp 22
+sp 15
 x 8
 y 14
 end
@@ -921,8 +921,8 @@ y 13
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 24
+hp 27
-sp 22
+sp 15
 x 9
 y 14
 end
@@ -991,8 +991,8 @@ y 13
 end
 arch invis_exit
 slaying ../rainbow/islands
-hp 24
+hp 27
-sp 22
+sp 15
 x 10
 y 14
 end