X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=lib%2Fedit%2Ft0000001.txt;h=97c81fb5b258a1ff772a62567b10619d02ca0cbd;hb=0ffc2e70fd0f984ef5a3ab1582a2a5602228458d;hp=fb150a951af3f210135bf857be64e605f0b31f3f;hpb=5189400927b6bd8013b19ff477b2c3b032f4b9b8;p=hengband%2Fhengband.git

diff --git a/lib/edit/t0000001.txt b/lib/edit/t0000001.txt
index fb150a951..97c81fb5b 100644
--- a/lib/edit/t0000001.txt
+++ b/lib/edit/t0000001.txt
@@ -6,102 +6,111 @@
 ############### Additional default terrain settings ###############
 
 # Default for castle reward
-F:!:1:3
+F:!:FLOOR:3
 
 # Default for inn reward
-F:@:1:3
+F:@:FLOOR:3
 
 # Default for Quest 1 = entrance is tree
-F:z:96:3
+F:z:TREE:3
 
 # Default for Quest 18 = entrance is tree
-F:y:96:3
+F:y:TREE:3
 
 # Default for Quest 25 = entrance is stone
-F:x:63:3
+F:x:PERMANENT:3
 
 # Default for Quest 28 = entrance is stone
-F:w:63:3
+F:w:PERMANENT:3
 
 # Default for Quest 27 = entrance is grass
-F:v:89:3
+F:v:GRASS:3
+
+
+# Default for Quest 34 = entrance is stone
+F:A:PERMANENT:3
 
 # Default for Quest 31 = entrance is grass
-F:s:89:3
+F:s:GRASS:3
 
 # Default for Quest 32 = entrance is stone
-F:r:63:3
+F:r:PERMANENT:3
 
 # Default for Quest 33 = entrance is stone
-F:q:63:3
+F:q:PERMANENT:3
 
 
 ############### Quest 1 - Thieves Hideout ###############
 
 # Quest 1 untaken
 ?:[EQU $QUEST1 0]
-F:b:129:3:0:0:0:0:0:1
+F:b:BUILDING_1:3:0:0:0:0:NONE:1
 
 # Quest 1 taken, entrance is quest entrance
 ?:[EQU $QUEST1 1]
-F:z:8:3:0:0:0:0:0:1
-F:b:129:3:0:0:0:0:0:1
+F:z:QUEST_ENTER:3:0:0:0:0:NONE:1
+F:b:BUILDING_1:3:0:0:0:0:NONE:1
 
 # Quest 1 completed
 ?:[EQU $QUEST1 2]
-F:b:129:3:0:0:0:0:0:1
+F:b:BUILDING_1:3:0:0:0:0:NONE:1
 
 # Quest 1 rewarding, reward is a Longsword, continue with quest 14
 ?:[EQU $QUEST1 3]
-F:b:129:3:0:0:0:0:0:14
-F:!:1:3:0:42
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:42
 
 # Broad Spear
-?:[AND [EQU $QUEST1 3] [IOR [EQU $CLASS BeastMaster] [EQU $CLASS Cavalry] ] ]
-F:b:129:3:0:0:0:0:0:14
-F:!:1:3:0:543
+?:[AND [EQU $QUEST1 3] [EQU $CLASS BeastMaster Cavalry] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:543
 
 # Set of Gauntlets
-?:[AND [EQU $QUEST1 3] [IOR [EQU $CLASS Monk] [EQU $CLASS ForceTrainer] ] ]
-F:b:129:3:0:0:0:0:0:14
-F:!:1:3:0:126
+?:[AND [EQU $QUEST1 3] [EQU $CLASS Monk ForceTrainer] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:126
 
 # War Hammer
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Priest] ]
-F:b:129:3:0:0:0:0:0:14
-F:!:1:3:0:55
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:55
 
 # Short Bow
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Archer] ]
-F:b:129:3:0:0:0:0:0:14
-F:!:1:3:0:73
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:73
 
 # Broad Axe
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Weaponsmith] ]
-F:b:129:3:0:0:0:0:0:14
-F:!:1:3:0:70
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:70
 
 # Ring of Warning
-?:[AND [EQU $QUEST1 3] [IOR [EQU $CLASS Mage] [EQU $CLASS High-Mage] [EQU $CLASS Blue-Mage] [EQU $CLASS Sorcerer] [EQU $CLASS Mirror-Master]] ]
-F:b:129:3:0:0:0:0:0:14
-F:!:1:3:0:618
+?:[AND [EQU $QUEST1 3] [EQU $CLASS Mage High-Mage Blue-Mage Sorcerer Mirror-Master] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:618
 
 # Dagger
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Ninja] ]
-F:b:129:3:0:0:0:0:0:14
-F:!:1:3:0:43
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:43
+
+# Light Cross Bow
+?:[AND [EQU $QUEST1 3] [EQU $CLASS Sniper] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:75
 
 # Quest 1 finished, continue with quest 14
 ?:[EQU $QUEST1 4]
-F:b:129:3:0:0:0:0:0:14
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
 
 # Quest 1 failed, wait for the player to enter the castle
 ?:[EQU $QUEST1 5]
-F:b:129:3:0:0:0:0:0:1
+F:b:BUILDING_1:3:0:0:0:0:NONE:1
 
 # Quest 1 failed but done, continue with quest 14
 ?:[EQU $QUEST1 6]
-F:b:129:3:0:0:0:0:0:14
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
 
 ?:1
 
@@ -110,81 +119,86 @@ F:b:129:3:0:0:0:0:0:14
 
 # Quest 14 unfinished
 ?:[EQU $QUEST14 1]
-F:b:129:3:0:0:0:0:0:14
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
 
 # Quest 14 completed
 ?:[EQU $QUEST14 2]
-F:b:129:3:0:0:0:0:0:14
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
 
 # Quest 14 rewarding, reward is a Small Metal Shield,
-# continue with quest 25
+# continue with quest 18
 ?:[EQU $QUEST14 3]
-F:b:129:3:0:0:0:0:0:25
-F:!:1:3:0:130
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
+F:!:FLOOR:3:0:130
 
-?:[AND [EQU $QUEST14 3] [IOR [EQU $CLASS BeastMaster] [EQU $CLASS Cavalry] [EQU $CLASS Ninja] ] ]
-F:b:129:3:0:0:0:0:0:25
-F:!:1:3:0:126
+?:[AND [EQU $QUEST14 3] [EQU $CLASS BeastMaster Cavalry Ninja] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
+F:!:FLOOR:3:0:126
 
-# Continue with quest 25
+# Continue with quest 18
 ?:[EQU $QUEST14 4]
-F:b:129:3:0:0:0:0:0:25
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
 
 ?:1
 
+############### Quest 18 - Water Cave ###############
+
+# Quest 18 assigned, entrance is quest entrance
+?:[EQU $QUEST18 1]
+F:y:QUEST_ENTER:3:0:0:0:0:NONE:18
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
+
+# Quest 18 completed
+?:[EQU $QUEST18 2]
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
+
+# Quest 18 rewarding, reward is Potion of Experience
+# continue with quest 25
+?:[EQU $QUEST18 3]
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
+F:!:FLOOR:3:0:244
+
+# Quest 18 finished, continue with quest 25
+?:[EQU $QUEST18 4]
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
+
+# Quest 18 failed, wait for the player to enter the castle
+?:[EQU $QUEST18 5]
+F:b:BUILDING_1:3:0:0:0:0:NONE:18
+
+# Quest 18 failed but done, continue with quest 25
+?:[EQU $QUEST18 6]
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
+?:1
 
 ############### Quest 25 - Haunted House ###############
 
 # Quest 25 assigned, entrance is quest entrance
 ?:[EQU $QUEST25 1]
-F:x:8:3:0:0:0:0:0:25
-F:b:129:3:0:0:0:0:0:25
+F:x:QUEST_ENTER:3:0:0:0:0:NONE:25
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
 
 # Quest 25 completed
 ?:[EQU $QUEST25 2]
-F:b:129:3:0:0:0:0:0:25
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
 
-# Quest 25 rewarding, reward is Staff of Dispel Evil,
-# continue with quest 18
+# Quest 25 rewarding, reward is Amulet of Telepathy,
+# continue with quest 28
 ?:[EQU $QUEST25 3]
-F:b:129:3:0:0:0:0:0:18
-F:!:1:3:0:320
+F:b:BUILDING_1:3:0:0:0:0:NONE:28
+F:!:FLOOR:3:0:587
 
-# Quest 25 finished, continue with quest 18
+# Quest 25 finished, continue with quest 28
 ?:[EQU $QUEST25 4]
-F:b:129:3:0:0:0:0:0:18
+F:b:BUILDING_1:3:0:0:0:0:NONE:28
 
 # Quest 25 failed, wait for the player to enter the castle
 ?:[EQU $QUEST25 5]
-F:b:129:3:0:0:0:0:0:25
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
 
-# Quest 25 failed but done, continue with quest 18
+# Quest 25 failed but done, continue with quest 28
 ?:[EQU $QUEST25 6]
-F:b:129:3:0:0:0:0:0:18
-
-?:1
-
-
-############### Quest 18 - Water Cave ###############
-
-# Quest 18 assigned, entrance is quest entrance
-?:[EQU $QUEST18 1]
-F:y:8:3:0:0:0:0:0:18
-F:b:129:3:0:0:0:0:0:18
-
-# Quest 18 completed
-?:[EQU $QUEST18 2]
-F:b:129:3:0:0:0:0:0:18
-
-# Quest 18 rewarding, reward is Ring of Poison Resistance,
-# continue with quest 28
-?:[EQU $QUEST18 3]
-F:b:129:3:0:0:0:0:0:28
-F:!:1:3:0:143
-
-# Quest 18 finished, continue with quest 28
-?:[EQU $QUEST18 4]
-F:b:129:3:0:0:0:0:0:28
+F:b:BUILDING_1:3:0:0:0:0:NONE:28
 
 ?:1
 
@@ -193,64 +207,102 @@ F:b:129:3:0:0:0:0:0:28
 
 # Quest 28 assigned, entrance is quest entrance
 ?:[EQU $QUEST28 1]
-F:w:8:3:0:0:0:0:0:28
-F:b:129:3:0:0:0:0:0:28
+F:w:QUEST_ENTER:3:0:0:0:0:NONE:28
+F:b:BUILDING_1:3:0:0:0:0:NONE:28
 
 # Quest 28 completed
 ?:[EQU $QUEST28 2]
-F:b:129:3:0:0:0:0:0:28
+F:b:BUILDING_1:3:0:0:0:0:NONE:28
 
 # Quest 28 rewarding, you don't get none, no new quest available
 ?:[EQU $QUEST28 3]
-F:b:129:3
+F:b:BUILDING_1:3
 
 # Quest 28 finished, no new quest available
 ?:[EQU $QUEST28 4]
-F:b:129:3
+F:b:BUILDING_1:3
 
 # Quest 28 failed, no new quest available
 ?:[EQU $QUEST28 5]
-F:b:129:3:0:0:0:0:0:28
+F:b:BUILDING_1:3:0:0:0:0:NONE:28
 
 # Quest 28 failed but done, no new quest available
 ?:[EQU $QUEST28 6]
-F:b:129:3
+F:b:BUILDING_1:3
 
 ?:1
 
 
-############### Quest 31 - Old Man Willow Quest ###############
+############### Quest 34 - Locked Room Murder Case ###############
+
+# Quest 34 untaken
+?:[EQU $QUEST34 0]
+F:a:BUILDING_0:3:0:0:0:0:NONE:34
+
+# Quest 34 taken, entrance is quest entrance
+?:[EQU $QUEST34 1]
+F:A:QUEST_ENTER:3:0:0:0:0:NONE:34
+F:a:BUILDING_0:3:0:0:0:0:NONE:34
+
+# Quest 34 completed
+?:[EQU $QUEST34 2]
+F:a:BUILDING_0:3:0:0:0:0:NONE:34
 
-# Quest 31 untaken
-?:[EQU $QUEST31 0]
-F:a:128:3:0:0:0:0:0:31
+# Quest 34 rewarding, Ring of Warning
+# continue with quest 31
+?:[EQU $QUEST34 3]
+F:a:BUILDING_0:3:0:0:0:0:NONE:31
+F:@:FLOOR:3:0:618
+
+# Light Crossbow
+?:[AND [EQU $QUEST34 3] [EQU $CLASS Mage High-Mage Blue-Mage Sorcerer Mirror-Master] ]
+F:a:BUILDING_0:3:0:0:0:0:NONE:31
+F:@:FLOOR:3:0:75
+
+
+# Quest 34 finished, continue with quest 31
+?:[EQU $QUEST34 4]
+F:a:BUILDING_0:3:0:0:0:0:NONE:31
+
+# Quest 34 failed, wait for the player to enter the Inn
+?:[EQU $QUEST34 5]
+F:a:BUILDING_0:3:0:0:0:0:NONE:34
+
+# Quest 34 failed but done, continue with quest 31
+?:[EQU $QUEST34 6]
+F:a:BUILDING_0:3:0:0:0:0:NONE:31
+
+?:1
+
+
+############### Quest 31 - Old Man Willow Quest ###############
 
 # Quest 31 taken, entrance is quest entrance
 ?:[EQU $QUEST31 1]
-F:s:8:3:0:0:0:0:0:31
-F:a:128:3:0:0:0:0:0:31
+F:s:QUEST_ENTER:3:0:0:0:0:NONE:31
+F:a:BUILDING_0:3:0:0:0:0:NONE:31
 
 # Quest 31 completed
 ?:[EQU $QUEST31 2]
-F:a:128:3:0:0:0:0:0:31
+F:a:BUILDING_0:3:0:0:0:0:NONE:31
 
 # Quest 31 rewarding, Ring of confusion resistance
 # continue with quest 32
 ?:[EQU $QUEST31 3]
-F:a:128:3:0:0:0:0:0:32
-F:@:1:3:0:430
+F:a:BUILDING_0:3:0:0:0:0:NONE:32
+F:@:FLOOR:3:0:430
 
 # Quest 31 finished, continue with quest 32
 ?:[EQU $QUEST31 4]
-F:a:128:3:0:0:0:0:0:32
+F:a:BUILDING_0:3:0:0:0:0:NONE:32
 
 # Quest 31 failed, wait for the player to enter the Inn
 ?:[EQU $QUEST31 5]
-F:a:128:3:0:0:0:0:0:31
+F:a:BUILDING_0:3:0:0:0:0:NONE:31
 
 # Quest 31 failed but done, continue with quest 32
 ?:[EQU $QUEST31 6]
-F:a:128:3:0:0:0:0:0:32
+F:a:BUILDING_0:3:0:0:0:0:NONE:32
 
 ?:1
 
@@ -259,30 +311,30 @@ F:a:128:3:0:0:0:0:0:32
 
 # Quest 32 taken, entrance is quest entrance
 ?:[EQU $QUEST32 1]
-F:r:8:3:0:0:0:0:0:32
-F:a:128:3:0:0:0:0:0:32
+F:r:QUEST_ENTER:3:0:0:0:0:NONE:32
+F:a:BUILDING_0:3:0:0:0:0:NONE:32
 
 # Quest 32 completed
 ?:[EQU $QUEST32 2]
-F:a:128:3:0:0:0:0:0:32
+F:a:BUILDING_0:3:0:0:0:0:NONE:32
 
 # Quest 32 rewarding, The Incandescent Light of Yeduson
-# continue with quest 27
+# continue with quest 33
 ?:[EQU $QUEST32 3]
-F:a:128:3:0:0:0:0:0:33
-F:@:1:3:0:0:0:1
+F:a:BUILDING_0:3:0:0:0:0:NONE:33
+F:@:FLOOR:3:0:0:0:1
 
-# Quest 32 finished, continue with quest 27
+# Quest 32 finished, continue with quest 33
 ?:[EQU $QUEST32 4]
-F:a:128:3:0:0:0:0:0:33
+F:a:BUILDING_0:3:0:0:0:0:NONE:33
 
 # Quest 32 failed, wait for the player to enter the Inn
 ?:[EQU $QUEST32 5]
-F:a:128:3:0:0:0:0:0:32
+F:a:BUILDING_0:3:0:0:0:0:NONE:32
 
-# Quest 32 failed but done, continue with quest 27
+# Quest 32 failed but done, continue with quest 33
 ?:[EQU $QUEST32 6]
-F:a:128:3:0:0:0:0:0:33
+F:a:BUILDING_0:3:0:0:0:0:NONE:33
 
 ?:1
 
@@ -291,31 +343,31 @@ F:a:128:3:0:0:0:0:0:33
 
 # Quest 33 taken, entrance is quest entrance
 ?:[EQU $QUEST33 1]
-F:q:8:3:0:0:0:0:0:33
-F:a:128:3:0:0:0:0:0:33
+F:q:QUEST_ENTER:3:0:0:0:0:NONE:33
+F:a:BUILDING_0:3:0:0:0:0:NONE:33
 
 # Quest 33 completed
 ?:[EQU $QUEST33 2]
-F:a:128:3:0:0:0:0:0:33
+F:a:BUILDING_0:3:0:0:0:0:NONE:33
 
 # Quest 33 rewarding
 # reward is The Pair of Soft Leather Boots of Shiva's Avatar
 # no new quest is available
 ?:[EQU $QUEST33 3]
-F:a:128:3:0:0:0:0:0:27
-F:@:1:3:0:0:0:63
+F:a:BUILDING_0:3:0:0:0:0:NONE:27
+F:@:FLOOR:3:0:0:0:63
 
-# Quest 33 finished, no new quest is available
+# Quest 33 finished, continue with quest 27
 ?:[EQU $QUEST33 4]
-F:a:128:3:0:0:0:0:0:27
+F:a:BUILDING_0:3:0:0:0:0:NONE:27
 
 # Quest 33 failed, wait for the player to enter the Inn
 ?:[EQU $QUEST33 5]
-F:a:128:3:0:0:0:0:0:33
+F:a:BUILDING_0:3:0:0:0:0:NONE:33
 
-# Quest 33 failed but done, no new quest is available
+# Quest 33 failed but done, continue with quest 27
 ?:[EQU $QUEST33 6]
-F:a:128:3:0:0:0:0:0:27
+F:a:BUILDING_0:3:0:0:0:0:NONE:27
 
 ?:1
 
@@ -324,117 +376,123 @@ F:a:128:3:0:0:0:0:0:27
 
 # Quest 27 assigned, entrance is quest entrance
 ?:[EQU $QUEST27 1]
-F:v:8:3:0:0:0:0:0:27
-F:a:128:3:0:0:0:0:0:27
+F:v:QUEST_ENTER:3:0:0:0:0:NONE:27
+F:a:BUILDING_0:3:0:0:0:0:NONE:27
 
 # Quest 27 completed
 ?:[EQU $QUEST27 2]
-F:a:128:3:0:0:0:0:0:27
+F:a:BUILDING_0:3:0:0:0:0:NONE:27
 
 # Quest 27 rewarding (default reward if not given one from below)
 # the Executioner's Sword 'Crisdurian'
-# continue with quest 33
 ?:[EQU $QUEST27 3]
-F:a:128:3
-F:@:1:3:0:0:0:80
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:80
 
+# Quest 27 rewarding (Weaponsmith gets Multi-Hued Dragon Scale Mail)
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Weaponsmith] ]
-F:a:128:3
-F:@:1:3:0:405
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:405
 
 # Quest 27 rewarding (Tourist gets The Platinum Yendorian Express Card)
-# continue with quest 33
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Tourist] ]
-F:a:128:3
-F:@:1:3:0:0:0:141
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:141
 
-# Quest 27 rewarding (Ranger, Archer gets The Long Bow of Bard)
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Ranger] [EQU $CLASS Archer] ] ]
-F:a:128:3
-F:@:1:3:0:0:0:125
-
-# Quest 27 rewarding (Warrior, Berserker gets The Glaive of Pain)
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Warrior] [EQU $CLASS Berserker] ] ]
-F:a:128:3
-F:@:1:3:0:0:0:94
+# Quest 27 rewarding (Ranger and Archer get The Long Bow of Yoichi)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Ranger Archer] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:148
 
-# Quest 27 rewarding (BeastMaster gets The Lance of Eorlingas)
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [EQU $CLASS BeastMaster] ]
-F:a:128:3
-F:@:1:3:0:0:0:100
+# Quest 27 rewarding (Warrior and Berserker get The Glaive of Pain)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Warrior Berserker] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:94
 
 # Quest 27 rewarding (Cavalry gets GaeBolg)
-# continue with quest 33
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Cavalry] ]
-F:a:128:3
-F:@:1:3:0:0:0:163
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:163
 
 # Quest 27 rewarding (Chaos-Warrior gets Zarcuthra)
-# continue with quest 33
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Chaos-Warrior] ]
-F:a:128:3
-F:@:1:3:0:0:0:77
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:77
 
 # Quest 27 rewarding (Rogue gets The Sling of Buckland)
-# continue with quest 33
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Rogue] ]
-F:a:128:3
-F:@:1:3:0:0:0:134
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:134
 
 # Quest 27 rewarding (Monk gets The Leather Jacket of Shiva's Avatar)
-# continue with quest 33
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Monk] ]
-F:a:128:3
-F:@:1:3:0:0:0:26
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:26
 
 # Quest 27 rewarding (Ninja gets The Amulet of the Pitch Dark Night)
-# continue with quest 33
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Ninja] ]
-F:a:128:3
-F:@:1:3:0:0:0:215
-
-# Quest 27 rewarding (Mage, High-Mage)
-# get The Hard Leather Cap of Indra
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [IOR [IOR [EQU $CLASS Mage] [EQU $CLASS High-Mage] ] [IOR [EQU $CLASS Sorcerer] [EQU $CLASS Blue-Mage] ] ] ]
-F:a:128:3
-F:@:1:3:0:0:0:33
-
-# Quest 27 rewarding (Priest, Bard, ForceTrainer)
-# get The Palantir of Westernesse
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [IOR [IOR [EQU $CLASS Priest] [EQU $CLASS Bard] ] [IOR [EQU $CLASS ForceTrainer] [EQU $CLASS Mindcrafter] ] ] ]
-F:a:128:3
-F:@:1:3:0:0:0:15
-
-# Quest 27 rewarding (Magiceater, Mirror-Master)
-# get The Jewel Encrusted Crown of Numenor
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Magiceater] [EQU $CLASS Mirror-Master] ] ] ]
-F:a:128:3
-F:@:1:3:0:0:0:132
-
-# Quest 27 rewarding (Samurai)
-# get Groo
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [EQU $CLASS Samurai] ]
-F:a:128:3
-F:@:1:3:0:0:0:81
-
-# Quest 27 finished, continue with quest 33
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:215
+
+# Quest 27 rewarding (Mage, High-Mage, Sorcerer, Blue-Mage and Mindcrafter
+# get The Hard Leather Cap of Indra)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Mage High-Mage Sorcerer Blue-Mage Mindcrafter] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:33
+
+# Quest 27 rewarding (Priest, Bard and ForceTrainer
+# get The Palantir of Westernesse)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Priest Bard ForceTrainer] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:15
+
+# Quest 27 rewarding (Mirror-Master gets The Jewel Encrusted Crown of Numenor)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Mirror-Master] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:132
+
+# Quest 27 rewarding (Samurai, Warrior-Mage and Red-Mage gets The Katana 'Aglarang')
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Samurai Warrior-Mage Red-Mage] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:81
+
+# Quest 27 rewarding (Crusade Paladin gets the Amulet of Sacred Knights)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Paladin] [EQU $REALM1 Crusade] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:217
+
+# Quest 27 rewarding (Death Paladin gets the Collar Harness of the Hell)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Paladin] [EQU $REALM1 Death] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:218
+
+# Quest 27 rewarding (BeastMaster  and Magic-Eater 
+# get The Charmed Pendant)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Magic-Eater BeastMaster] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:219
+
+# Quest 27 rewarding (Imitator gets the Pendant of Gogo)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Imitator] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:220
+
+# Quest 27 rewarding (Sniper gets The Light Crossbow of Wilhelm Tell)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Sniper] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:223
+
+# Quest 27 finished, no new quest is available
 ?:[EQU $QUEST27 4]
-F:a:128:3
+F:a:BUILDING_0:3
 
 # Quest 27 failed, wait for the player to enter the inn
 ?:[EQU $QUEST27 5]
-F:a:128:3:0:0:0:0:0:27
+F:a:BUILDING_0:3:0:0:0:0:NONE:27
 
-# Quest 27 failed but done, continue with quest 33
+# Quest 27 failed but done, no new quest is available
 ?:[EQU $QUEST27 6]
-F:a:128:3
+F:a:BUILDING_0:3
 
 ?:1
 
@@ -522,7 +580,7 @@ D:#TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTWWWTTTTTTTTTTTTTTTTTTTTTTTT--.,WW##........####
 D:#TTTTTTTTTTTTTTTTTTTTTTTTTTTTTWTTTTTTTTTTTTTTTTTTTTTTTTT----.,WW##....................................#########....................##WW,.--TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT#
 D:#TTTTTTTTTTTTTTTTTTTTTTTTTTTTTWTTTTTTTTTTTTTTTTTTTTTTTTTT---.,WW##.............###########.........................................##WW,.---TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT#
 D:#TTTTTTTTTTTTTTTTTTTTTTTTTTTWWTTTTTTTTTTTTTTTTTTTTTTTTTTT---.,WW##....##x##....###########....###0###...................####.......##WW,.----TTTTTTTTTTTTTTTTTT..................TTTTTTTTTTTTTTTTTTTT#
-D:#TTTTTTTTTTTTTTTTTTTTTTTTTWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTT---.,WW##....#####....#####7#####....#######.....###q###.......###8.......##WW,.----TTTTT.............TTTTTTTTTTTTTTTTTT.TTTTTTTTTTTTTTTTTTT#
+D:#TTTTTTTTTTTTTTTTTTTTTTTTTWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTT---.,WW##....#####....#####7#####....#######.....###Aq##.......###8.......##WW,.----TTTTT.............TTTTTTTTTTTTTTTTTT.TTTTTTTTTTTTTTTTTTT#
 D:#TTTTTTTTTTTTTTTTTTTTTTTWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT---.,WW##....#####...................#######.....###r###.......####.......##WW,..........TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTTTTTTTTTTT#
 D:#TTTTTTTTTTTTTTTTTTTWWWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT---.,W###.................................................................###W,.----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTTTTTTTTTT#
 D:#TTTTTTTTTTTTTTTTTTWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT----.,W#######################################################################W,.---TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTTTTTTTTT#
@@ -560,14 +618,14 @@ P:33:131
 ?:[EQU $LEAVING_QUEST 1]
 P:34:177
 
-# Starting position when coming from quest 25
-?:[EQU $LEAVING_QUEST 25]
-P:43:72
-
 # Starting position when coming from quest 18
 ?:[EQU $LEAVING_QUEST 18]
 P:56:17
 
+# Starting position when coming from quest 25
+?:[EQU $LEAVING_QUEST 25]
+P:43:72
+
 # Starting position when coming from quest 27
 ?:[EQU $LEAVING_QUEST 27]
 P:19:176
@@ -582,9 +640,13 @@ P:16:176
 
 # Starting position when coming from quest 32
 ?:[EQU $LEAVING_QUEST 32]
-P:47:109
+P:47:108
 
 # Starting position when coming from quest 33
 ?:[EQU $LEAVING_QUEST 33]
 P:44:109
 
+# Starting position when coming from quest 34
+?:[EQU $LEAVING_QUEST 34]
+P:44:109
+