- Multi-line message linebreaks removed; redundant match strings removed (only

lowercase is required); minor npc msg text changes; and edits introduced by
  CFJavaEditor.


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

pup_land/s_f/to-jyo

@@ -1,13 +1,13 @@
 arch map
-region pupland
 name to-jyo
+region pupland
+width 36
+height 15
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Fri Feb  9 15:11:55 1996
 endmsg
-width 36
-height 15
 end
 arch sea
 end
@@ -285,14 +285,14 @@ x 3
 y 2
 end
 arch woodfloor
-type 41
 hp 24
 sp 14
-activate_on_push 1
-activate_on_release 1
-connected 2
 x 3
 y 3
+type 41
+connected 2
+activate_on_push 1
+activate_on_release 1
 end
 arch guildmaster
 name To-jyo
@@ -300,30 +300,23 @@ msg
 @match jake|griffin
 My old friend... Say hello to him.
 @match treasure
-You may read my research note upstairs.
+You may read my research note upstairs, but keep off the CRYSTAL, okay?!
-But keep off the CRYSTAL, okay?!
 It would tempt your soul.
 @match crystal
 If you are tempted, call me for "help".
 @match odo
-Odo was a mighty god in the ancient
+Odo was a mighty god in the ancient world. Odo helped and protected the early civilization on these islands...
-world. Odo helped and protected the
+The people were ungrateful, so Odo took away the artifacts he had made for his disciples, locked them up in an underground tower and left this world.
-early civilization on these islands...
+Soon the people forgot about Odo...
-but the people were ungrateful. So Odo
-took away the artifacts he had made
-for his diciples, locked them up
-in an underground tower and left this
-world. Soon the people forgot about
-Odo...
 @match *
 Hello, boy.
 endmsg
 hp 500
-immune 8388607
-friendly 1
-unaggressive 0
 x 3
 y 3
+friendly 1
+unaggressive 0
+immune 8388607
 end
 arch pstone_1
 x 3
@@ -334,10 +327,10 @@ x 3
 y 4
 end
 arch table
-material 0
-no_pick 1
 x 3
 y 4
+material 0
+no_pick 1
 end
 arch pstone_1
 x 3
@@ -771,11 +764,11 @@ x 8
 y 8
 end
 arch grate_closed_2
-speed 0.500000
-protected 6
-connected 6
 x 8
 y 8
+speed 0.500000
+connected 6
+protected 6
 end
 arch pstone_1
 x 8
@@ -877,13 +870,13 @@ y 7
 end
 arch magic_ear
 msg
-@match General|general
+@match general
 Click.
 endmsg
-protected 6
-connected 6
 x 9
 y 8
+connected 6
+protected 6
 end
 arch pstone_1
 x 9
@@ -1500,19 +1493,19 @@ y 13
 end
 arch button_small
 name 2
-protected 2
-weight 10000
-connected 2
 x 18
 y 14
+weight 10000
+connected 2
+protected 2
 end
 arch creator
 name 1
 other_arch boulder
-protected 1
-connected 1
 x 18
 y 14
+connected 1
+protected 1
 end
 arch blocked
 x 19
@@ -1604,17 +1597,17 @@ arch teleporter
 name 3
 hp 3
 sp 3
-speed 0.000000
-protected 3
-connected 3
 x 19
 y 14
+speed 0.000000
+connected 3
+protected 3
 end
 arch chair_1.1
-material 0
-no_pick 1
 x 19
 y 14
+material 0
+no_pick 1
 end
 arch blocked
 x 20
@@ -1638,10 +1631,7 @@ end
 arch note
 name To-jyo's research note
 msg
-Rumours say that the Sword of Odo
+Rumours say that the Sword of Odo would pretty much look like Belzebub's sword, but I've never seen Belzebub's sword, so I can't make a replica.
-would pretty much look like Belzebub's
-sword. But I've never seen Belzebub's
-sword, so I can't make a replica.
 endmsg
 x 20
 y 3
@@ -1718,10 +1708,10 @@ name crown of Odo (replica)
 msg
 This is a well made replica
 endmsg
-value 1
-identified 1
 x 21
 y 2
+value 1
+identified 1
 end
 arch flagstone
 x 21
@@ -1733,11 +1723,11 @@ msg
 This is a well made replica
 endmsg
 ac 1
-armour 1
-value 1
-identified 1
 x 21
 y 3
+value 1
+identified 1
+armour 1
 end
 arch flagstone
 x 21
@@ -1748,10 +1738,10 @@ name cloak of Odo (replica)
 msg
 This is a well made replica
 endmsg
-value 1
-identified 1
 x 21
 y 4
+value 1
+identified 1
 end
 arch woodfloor
 x 21
@@ -1799,12 +1789,12 @@ y 13
 end
 arch igate_open_2
 name 2
-speed 0.500000
-protected 2
-value 1
-connected 2
 x 21
 y 14
+speed 0.500000
+value 1
+connected 2
+protected 2
 end
 arch food
 x 21
@@ -1847,12 +1837,12 @@ msg
 This is a well made replica
 endmsg
 ac 0
-armour 1
-protected 0
-value 1
-identified 1
 x 22
 y 3
+value 1
+identified 1
+armour 1
+protected 0
 end
 arch flagstone
 x 22
@@ -1905,10 +1895,10 @@ end
 arch altar
 name 4 - To-jyo upstairs
 food 1
-protected 4
-connected 4
 x 22
 y 14
+connected 4
+protected 4
 end
 arch blocked
 x 23
@@ -2076,10 +2066,10 @@ y 13
 end
 arch button_small
 name 3 - chair
-protected 3
-connected 3
 x 24
 y 14
+connected 3
+protected 3
 end
 arch blocked
 x 25
@@ -2239,25 +2229,19 @@ arch teleporter
 name 4
 hp 34
 sp 6
-speed 0.000000
-protected 4
-connected 4
 x 26
 y 14
+speed 0.000000
+connected 4
+protected 4
 end
 arch sage
 name To-jyo
 msg
 @match odo
-Odo was a mighty god in the ancient
+Odo was a mighty god in the ancient world. Odo helped and protected the early civilization on these islands...
-world. Odo helped and protected the
+The people were ungrateful, so Odo took away the artifacts he had made for his disciples, locked them up in an underground tower and left this world.
-early civilization on these islands...
+Soon the people forgot about Odo...
-but the people were ungrateful. So Odo
-took away the artifacts he had made
-for his diciples, locked them up
-in an underground tower and left this
-world. Soon the people forgot about
-Odo...
 @match *
 Ouch! My waist is broken!
 endmsg
@@ -2265,13 +2249,13 @@ hp 10000
 maxhp 10000
 sp 0
 maxsp 0
-immune 8388607
+x 26
+y 14
 monster 0
 unaggressive 0
 can_cast_spell 0
 can_use_skill 0
-x 26
+immune 8388607
-y 14
 end
 arch blocked
 x 27
@@ -2475,19 +2459,19 @@ x 29
 y 6
 end
 arch mover_4
+x 29
+y 6
 speed 1.000000
 speed_left -1.820000
 level 1
 attacktype 1
-x 29
-y 6
 end
 arch dungeon_magic
 name force
 face enchantment.111
-invisible 0
 x 29
 y 6
+invisible 0
 end
 arch woodfloor
 x 29
@@ -2585,19 +2569,19 @@ x 30
 y 6
 end
 arch mover_5
+x 30
+y 6
 speed 1.000000
 speed_left -3.170000
 level 1
 attacktype 1
-x 30
-y 6
 end
 arch dungeon_magic
 name force
 face enchantment.111
-invisible 0
 x 30
 y 6
+invisible 0
 end
 arch magic_mouth
 msg
@@ -2609,42 +2593,42 @@ end
 arch magic_ear
 msg
 @match help|to-jyo
-The To-jyo says:
+To-jyo says:
 Stupid adventurer - stupid crystal!
 Okay, okay, I'm coming...
 endmsg
-protected 1
-connected 1
 x 30
 y 7
+connected 1
+protected 1
 end
 arch woodfloor
 x 30
 y 7
 end
 arch mover_5
+x 30
+y 7
 speed 1.000000
 speed_left -3.170000
 level 1
-x 30
-y 7
 end
 arch dungeon_magic
 name force
 face enchantment.111
-invisible 0
 x 30
 y 7
+invisible 0
 end
 arch woodfloor
 x 30
 y 8
 end
 arch ggate_closed
-no_magic 1
-damned 1
 x 30
 y 8
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 30
@@ -2657,9 +2641,9 @@ end
 arch power_crystal
 name Crystal of temptation
 maxsp 1
-no_pick 1
 x 30
 y 9
+no_pick 1
 end
 arch woodfloor
 x 30
@@ -2729,38 +2713,38 @@ x 31
 y 6
 end
 arch mover_6
+x 31
+y 6
 speed 1.000000
 speed_left -1.430000
 level 1
 attacktype 1
-x 31
-y 6
 end
 arch dungeon_magic
 name force
 face enchantment.111
-invisible 0
 x 31
 y 6
+invisible 0
 end
 arch woodfloor
 x 31
 y 7
 end
 arch mover_7
+x 31
+y 7
 speed 1.000000
 speed_left -2.290000
 level 1
 attacktype 1
-x 31
-y 7
 end
 arch dungeon_magic
 name force
 face enchantment.111
-invisible 0
 x 31
 y 7
+invisible 0
 end
 arch woodfloor
 x 31
@@ -2823,11 +2807,9 @@ y 2
 end
 arch note
 name To-jyo's research note
-face scrollr.111
 msg
 The key to the ancient ruins...
-I suspect it's Odo's legendary
+I suspect it's Odo's legendary equipment:
-equipment:
 1. crown
 2. sword
 3. armour
@@ -2835,6 +2817,7 @@ equipment:
 5. cloak
 In this order, put in place.
 endmsg
+face scrollr.111
 x 32
 y 2
 end