X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=lib%2Fedit%2Ft_lite.txt;h=c69e13b009bf4a60dafe14fe1cea85470318768e;hb=4ed1ea50f41ee3bc7b5b8bd29d2cbd58196c0071;hp=0b66c7923d13de20a864614dd7ba8c07967b9ee0;hpb=366372c215d24e5b4e8b030b84003a15128b1eb5;p=hengband%2Fhengband.git

diff --git a/lib/edit/t_lite.txt b/lib/edit/t_lite.txt
index 0b66c7923..c69e13b00 100644
--- a/lib/edit/t_lite.txt
+++ b/lib/edit/t_lite.txt
@@ -5,117 +5,114 @@
 ############### Additional default terrain settings ###############
 
 # Default for reward
-F:!:1:3 
+F:!:FLOOR:3 
 
 # Default sorcery tower reward = floor
-F:(:1:3
+F:(:FLOOR:3
 
 # Default chaos tower reward = floor
-F:$:89:3
+F:$:GRASS:3
 
 # Default nature tower reward = floor
-F:":89:3
+F:":GRASS:3
 
 # Default for Quest 1 = entrance is tree
-F:z:96:3
-
-# Default for Quest 18 = entrance is tree
-F:y:96:3
+F:z:TREE:3
 
 # Default for quest 12 = grass
-F:x:89:3
+F:x:GRASS:3
 
 # Default for quest 11 = grass
-F:w:89:3
+F:w:GRASS:3
 
 # Default for quest 10 = grass
-F:v:89:3
+F:v:GRASS:3
 
 # Default for Quest 5 = entrance is stone
-F:u:63:3
+F:u:PERMANENT:3
 
 # Default for Quest 4 = entrance is stone
-F:t:63:3
+F:t:PERMANENT:3
 
 # Default for Quest 3 = entrance is stone
-F:s:63:3
+F:s:PERMANENT:3
 
 # Default for Quest 2 = entrance is floor
-F:r:1:3
+F:r:FLOOR:3
 
 # Default for Quest 27 = entrance is stone
-F:q:89:3
+F:q:GRASS:3
 
 # Default for Quest 15 = entrance is stone
-F:):63:3
+F:):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:2
-F:!:1:3:0:42
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
+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:2
-F:!:1:3:0:543
+?:[AND [EQU $QUEST1 3] [EQU $CLASS BeastMaster Cavalry] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
+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:2
-F:!:1:3:0:126
+?:[AND [EQU $QUEST1 3] [EQU $CLASS Monk ForceTrainer] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
+F:!:FLOOR:3:0:126
 
 # War Hammer
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Priest] ]
-F:b:129:3:0:0:0:0:0:2
-F:!:1:3:0:55
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
+F:!:FLOOR:3:0:55
 
 # Short Bow
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Archer] ]
-F:b:129:3:0:0:0:0:0:2
-F:!:1:3:0:73
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
+F:!:FLOOR:3:0:73
 
 # Broad Axe
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Weaponsmith] ]
-F:b:129:3:0:0:0:0:0:2
-F:!:1:3:0:70
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
+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:2
-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:2
+F:!:FLOOR:3:0:618
 
 # Dagger
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Ninja] ]
-F:b:129:3:0:0:0:0:0:2
-F:!:1:3:0:43
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
+F:!:FLOOR:3:0:43
 
 # Quest 1 finished, continue with quest 14
 ?:[EQU $QUEST1 4]
-F:b:129:3:0:0:0:0:0:2
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
 
 # Quest 1 failed
 ?:[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:2
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
 
 ?:1
 
@@ -123,29 +120,29 @@ F:b:129:3:0:0:0:0:0:2
 
 # Quest 2 assigned, entrance is quest entrance
 ?:[EQU $QUEST2 1]
-F:r:8:3:0:0:0:0:0:2
-F:b:129:3:0:0:0:0:0:2
+F:r:QUEST_ENTER:3:0:0:0:0:NONE:2
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
 
 # Quest 2 completed
 ?:[EQU $QUEST2 2]
-F:b:129:3:0:0:0:0:0:2
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
 
 # Quest 2 rewarding, reward is ring of light and darkness resistance
 ?:[EQU $QUEST2 3]
-F:b:129:3:0:0:0:0:0:3
-F:!:1:3:0:582
+F:b:BUILDING_1:3:0:0:0:0:NONE:3
+F:!:FLOOR:3:0:582
 
 # Quest 2 finished
 ?:[EQU $QUEST2 4]
-F:b:129:3:0:0:0:0:0:3
+F:b:BUILDING_1:3:0:0:0:0:NONE:3
 
 # Quest 2 failed
 ?:[EQU $QUEST2 5]
-F:b:129:3:0:0:0:0:0:2
+F:b:BUILDING_1:3:0:0:0:0:NONE:2
 
 # Quest 2 failed but done, continue with quest 3
 ?:[EQU $QUEST2 6]
-F:b:129:3:0:0:0:0:0:3
+F:b:BUILDING_1:3:0:0:0:0:NONE:3
 
 ?:1
 
@@ -153,29 +150,29 @@ F:b:129:3:0:0:0:0:0:3
 
 # Quest 3 assigned, entrance is quest entrance
 ?:[EQU $QUEST3 1]
-F:s:8:3:0:0:0:0:0:3
-F:b:129:3:0:0:0:0:0:3
+F:s:QUEST_ENTER:3:0:0:0:0:NONE:3
+F:b:BUILDING_1:3:0:0:0:0:NONE:3
 
 # Quest 3 completed
 ?:[EQU $QUEST3 2]
-F:b:129:3:0:0:0:0:0:3
+F:b:BUILDING_1:3:0:0:0:0:NONE:3
 
-# Quest 3 rewarding, reward is Staff of Teleportation
+# Quest 3 rewarding, reward is Stuff of Speed
 ?:[EQU $QUEST3 3]
-F:b:129:3:0:0:0:0:0:4
-F:!:1:3:0:365
+F:b:BUILDING_1:3:0:0:0:0:NONE:4
+F:!:FLOOR:3:0:314
 
 # Quest 3 finished
 ?:[EQU $QUEST3 4]
-F:b:129:3:0:0:0:0:0:4
+F:b:BUILDING_1:3:0:0:0:0:NONE:4
 
 # Quest 3 failed
 ?:[EQU $QUEST3 5]
-F:b:129:3:0:0:0:0:0:3
+F:b:BUILDING_1:3:0:0:0:0:NONE:3
 
 # Quest 3 failed but done, continue with quest 4
 ?:[EQU $QUEST3 6]
-F:b:129:3:0:0:0:0:0:4
+F:b:BUILDING_1:3:0:0:0:0:NONE:4
 
 ?:1
 
@@ -183,28 +180,28 @@ F:b:129:3:0:0:0:0:0:4
 
 # Quest 4 assigned, entrance is quest entrance
 ?:[EQU $QUEST4 1]
-F:t:8:3:0:0:0:0:0:4
-F:b:129:3:0:0:0:0:0:4
+F:t:QUEST_ENTER:3:0:0:0:0:NONE:4
+F:b:BUILDING_1:3:0:0:0:0:NONE:4
 
 # Quest 4 completed
 ?:[EQU $QUEST4 2]
-F:b:129:3:0:0:0:0:0:4
+F:b:BUILDING_1:3:0:0:0:0:NONE:4
 
 # Quest 4 rewarding, no extra reward
 ?:[EQU $QUEST4 3]
-F:b:129:3:0:0:0:0:0:5
+F:b:BUILDING_1:3:0:0:0:0:NONE:5
 
 # Quest 4 finished
 ?:[EQU $QUEST4 4]
-F:b:129:3:0:0:0:0:0:5
+F:b:BUILDING_1:3:0:0:0:0:NONE:5
 
 # Quest 4 failed
 ?:[EQU $QUEST4 5]
-F:b:129:3:0:0:0:0:0:4
+F:b:BUILDING_1:3:0:0:0:0:NONE:4
 
 # Quest 4 failed but done, continue with quest 5
 ?:[EQU $QUEST4 6]
-F:b:129:3:0:0:0:0:0:5
+F:b:BUILDING_1:3:0:0:0:0:NONE:5
 
 ?:1
 
@@ -212,193 +209,186 @@ F:b:129:3:0:0:0:0:0:5
 
 # Quest 5 assigned, entrance is quest entrance
 ?:[EQU $QUEST5 1]
-F:u:8:3:0:0:0:0:0:5
-F:b:129:3:0:0:0:0:0:5
+F:u:QUEST_ENTER:3:0:0:0:0:NONE:5
+F:b:BUILDING_1:3:0:0:0:0:NONE:5
 
 # Quest 5 completed
 ?:[EQU $QUEST5 2]
-F:b:129:3:0:0:0:0:0:5
+F:b:BUILDING_1:3:0:0:0:0:NONE:5
 
-# Quest 5 rewarding, continue with quest 16
-# reward is cheaper *Identify* at the Library (see buildings)
+# Quest 5 rewarding, continue with quest 27,
+# reward is cheaper *Identify* at the Library (see buildings) and Ring of Poison Resistance
 ?:[EQU $QUEST5 3]
-F:b:129:3:0:0:0:0:0:18
+F:b:BUILDING_1:3:0:0:0:0:NONE:27
+F:!:FLOOR:3:0:143
 
-# Quest 5 finished, continue with quest 16
+# Quest 5 finished, continue with quest 27
 ?:[EQU $QUEST5 4]
-F:b:129:3:0:0:0:0:0:18
-
-?:1
-
-############### Quest 18 - Water Cave ###############
-
-# Quest 15 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 15 completed
-?:[EQU $QUEST18 2]
-F:b:129:3:0:0:0:0:0:18
+F:b:BUILDING_1:3:0:0:0:0:NONE:27
 
-# Quest 15 rewarding, reward is Ring of Lordly Protection, no new quest available
-?:[EQU $QUEST18 3]
-F:b:129:3:0:0:0:0:0:27
-F:!:1:3:0:143
+# Quest 5 failed , wait for the player to enter the castle
+?:[EQU $QUEST5 5]
+F:b:BUILDING_1:3:0:0:0:0:NONE:5
 
-# Quest 15 finished, no new quest available
-?:[EQU $QUEST18 4]
-F:b:129:3:0:0:0:0:0:27
+# Quest 5 failed but done, continue with quest 27
+?:[EQU $QUEST5 6]
+F:b:BUILDING_1:3:0:0:0:0:NONE:27
 
 ?:1
 
+
 ############### Quest 27 - The Old Castle ###############
 
 # Quest 27 assigned, entrance is quest entrance
 ?:[EQU $QUEST27 1]
-F:q:8:3:0:0:0:0:0:27
-F:b:129:3:0:0:0:0:0:27
+F:q:QUEST_ENTER:3:0:0:0:0:NONE:27
+F:b:BUILDING_1:3:0:0:0:0:NONE:27
 
 # Quest 27 completed
 ?:[EQU $QUEST27 2]
-F:b:129:3:0:0:0:0:0:27
+F:b:BUILDING_1: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:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:80
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:BUILDING_1:3:0:0:0:0:NONE:15
+F:!:FLOOR:3:0:405
 
-# Quest 27 rewarding (Tourist gets Platinum Yendorian Express Card)
-# continue with quest 33
+# Quest 27 rewarding (Tourist gets The Platinum Yendorian Express Card)
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Tourist] ]
-F:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:141
-
-# Quest 27 rewarding (Ranger, Archer gets Long Bow of Bard)
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Ranger] [EQU $CLASS Archer] ] ]
-F:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:125
-
-# Quest 27 rewarding (Warrior gets Glaive of Pain)
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [EQU $CLASS Warrior] ]
-F:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:94
-
-# Quest 27 rewarding (BeastMaster gets Lance of Eorlingas)
-# continue with quest 33
-?:[AND [EQU $QUEST27 3] [EQU $CLASS BeastMaster] ]
-F:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:100
-
-# Quest 27 rewarding (Kihei gets GaeBolg)
-# continue with quest 33
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+F:!:FLOOR:3:0:0:0:141
+
+# Quest 27 rewarding (Ranger and Archer get The Long Bow of Bard)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Ranger Archer] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+F:!:FLOOR:3:0:0:0:125
+
+# Quest 27 rewarding (Warrior and Berserker get The Glaive of Pain)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Warrior Berserker] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+F:!:FLOOR:3:0:0:0:94
+
+# Quest 27 rewarding (Cavalry gets GaeBolg)
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Cavalry] ]
-F:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:163
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:77
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+F:!:FLOOR:3:0:0:0:77
 
-# Quest 27 rewarding (Rogue gets Sling of Buckland)
-# continue with quest 33
+# Quest 27 rewarding (Rogue gets The Sling of Buckland)
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Rogue] ]
-F:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:134
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:26
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+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 Hard Leather Cap of Ben Franklin
-# 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:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:33
-
-# Quest 27 rewarding (Priest, Bard, ForceTrainer)
-# get 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:b:129:3:0:0:0:0:0:15
-F:!:1:3:0:0:0:15
-
-# Quest 27 rewarding (Magiceater, Mirror-Master)
-# get 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:b:129:3
-F:!:1:3:0:0:0:81
-
-# Quest 27 finished, continue with quest 33
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:BUILDING_1:3:0:0:0:0:NONE:15
+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:b:BUILDING_1:3:0:0:0:0:NONE:15
+F:!:FLOOR:3:0:0:0:219
+
+# Quest 27 rewarding (Imitator gets the Pendant of Gogo)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Imitator] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+F:!:FLOOR:3:0:0:0:220
+
+# Quest 27 rewarding (Sniper gets The Heavy Crossbow 'Lion Slayer')
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Sniper] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
+F:!:FLOOR:3:0:0:0:240
+
+# Quest 27 finished, continue with quest 15
 ?:[EQU $QUEST27 4]
-F:b:129:3:0:0:0:0:0:15
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
 
 # Quest 27 failed, wait for the player to enter the inn
 ?:[EQU $QUEST27 5]
-F:b:129:3:0:0:0:0:0:27
+F:b:BUILDING_1:3:0:0:0:0:NONE:27
 
-# Quest 27 failed but done, continue with quest 33
+# Quest 27 failed but done, continue with quest 15
 ?:[EQU $QUEST27 6]
-F:b:129:3:0:0:0:0:0:15
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
 
 ?:1
 
-
 #################### Quest 15 - Eric's Stronghold ####################
 
 # Quest 15 assigned, entrance is quest entrance
 ?:[EQU $QUEST15 1]
-F:):8:3:0:0:0:0:0:15
-F:b:129:3:0:0:0:0:0:15
+F:):QUEST_ENTER:3:0:0:0:0:NONE:15
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
 
 # Quest 15 completed
 ?:[EQU $QUEST15 2]
-F:b:129:3:0:0:0:0:0:15
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
 
 # Quest 15 rewarding, no new quest available,
 # Reward is potion of augmentation
 ?:[EQU $QUEST15 3]
-F:b:129:3
-F:!:1:3:0:418
+F:b:BUILDING_1:3
+F:!:FLOOR:3:0:418
 
 # Quest 15 finished, no new quest available,
 ?:[EQU $QUEST15 4]
-F:b:129:3
+F:b:BUILDING_1:3
 
 # Quest 15 failed
 ?:[EQU $QUEST15 5]
-F:b:129:3:0:0:0:0:0:15
+F:b:BUILDING_1:3:0:0:0:0:NONE:15
 
 # Quest 15 failed but done, no new quest available,
 ?:[EQU $QUEST15 6]
-F:b:129:3
+F:b:BUILDING_1:3
 
 ?:1
 
@@ -406,33 +396,33 @@ F:b:129:3
 
 # Quest 10 not started
 ?:[EQU $QUEST10 0]
-F:l:139:3:0:0:0:0:0:10
+F:l:BUILDING_11:3:0:0:0:0:NONE:10
 
 # Quest 10 assigned, entrance is quest entrance
 ?:[EQU $QUEST10 1]
-F:v:8:3:0:0:0:0:0:10
-F:l:139:3:0:0:0:0:0:10
+F:v:QUEST_ENTER:3:0:0:0:0:NONE:10
+F:l:BUILDING_11:3:0:0:0:0:NONE:10
 
 # Quest 10 completed
 ?:[EQU $QUEST10 2]
-F:l:139:3:0:0:0:0:0:10
+F:l:BUILDING_11:3:0:0:0:0:NONE:10
 
 # Quest 10 rewarding, reward is the Grimoire of Power
 ?:[EQU $QUEST10 3]
-F:l:139:3
-F:(:1:3:0:337
+F:l:BUILDING_11:3
+F:(:FLOOR:3:0:337
 
 # Quest 10 finished, no new quest available
 ?:[EQU $QUEST10 4]
-F:l:139:3
+F:l:BUILDING_11:3
 
 # Quest 10 failed
 ?:[EQU $QUEST10 5]
-F:l:139:3:0:0:0:0:0:10
+F:l:BUILDING_11:3:0:0:0:0:NONE:10
 
 # Quest 10 failed but done, no new quest available
 ?:[EQU $QUEST10 6]
-F:l:139:3
+F:l:BUILDING_11:3
 
 ?:1
 
@@ -441,33 +431,33 @@ F:l:139:3
 
 # Quest 11 not yet assigned
 ?:[EQU $QUEST11 0]
-F:n:141:3:0:0:0:0:0:11
+F:n:BUILDING_13:3:0:0:0:0:NONE:11
 
 # Quest 11 assigned, entrance is quest entrance
 ?:[EQU $QUEST11 1]
-F:w:8:3:0:0:0:0:0:11
-F:n:141:3:0:0:0:0:0:11
+F:w:QUEST_ENTER:3:0:0:0:0:NONE:11
+F:n:BUILDING_13:3:0:0:0:0:NONE:11
 
 # Quest 11 completed
 ?:[EQU $QUEST11 2]
-F:n:141:3:0:0:0:0:0:11
+F:n:BUILDING_13:3:0:0:0:0:NONE:11
 
 # Quest 11 rewarding, reward is Armageddon Tome, no new quest available
 ?:[EQU $QUEST11 3]
-F:n:141:3
-F:$:89:3:0:386
+F:n:BUILDING_13:3
+F:$:GRASS:3:0:386
 
 # Quest 11 finished, no new quest available
 ?:[EQU $QUEST11 4]
-F:n:141:3
+F:n:BUILDING_13:3
 
 # Quest 11 failed
 ?:[EQU $QUEST11 5]
-F:n:141:3:0:0:0:0:0:11
+F:n:BUILDING_13:3:0:0:0:0:NONE:11
 
 # Quest 11 failed but done, no new quest available
 ?:[EQU $QUEST11 6]
-F:n:141:3
+F:n:BUILDING_13:3
 
 ?:1
 
@@ -476,33 +466,33 @@ F:n:141:3
 
 # Quest 12 not yet assigned
 ?:[EQU $QUEST12 0]
-F:o:142:3:0:0:0:0:0:12
+F:o:BUILDING_14:3:0:0:0:0:NONE:12
 
 # Quest 12 assigned, entrance is quest entrance
 ?:[EQU $QUEST12 1]
-F:x:8:3:0:0:0:0:0:12
-F:o:142:3:0:0:0:0:0:12
+F:x:QUEST_ENTER:3:0:0:0:0:NONE:12
+F:o:BUILDING_14:3:0:0:0:0:NONE:12
 
 # Quest 12 completed
 ?:[EQU $QUEST12 2]
-F:o:142:3:0:0:0:0:0:12
+F:o:BUILDING_14:3:0:0:0:0:NONE:12
 
 # Quest 12 rewarding, reward is Nature's wrath, no new quest available
 ?:[EQU $QUEST12 3]
-F:o:142:3
-F:":89:3:0:382
+F:o:BUILDING_14:3
+F:":GRASS:3:0:382
 
 # Quest 12 finished, no new quest available
 ?:[EQU $QUEST12 4]
-F:o:142:3
+F:o:BUILDING_14:3
 
 # Quest 12 failed
 ?:[EQU $QUEST12 5]
-F:o:142:3:0:0:0:0:0:12
+F:o:BUILDING_14:3:0:0:0:0:NONE:12
 
 # Quest 12 failed but done, no new quest available
 ?:[EQU $QUEST12 6]
-F:o:142:3
+F:o:BUILDING_14:3
 
 ?:1
 
@@ -531,12 +521,12 @@ B:$2:N:Library:Astinus:Human?
 B:2:N:¿Þ½ñ´Û:¥¢¥¹¥Æ¥£¥Ì¥¹:¿Í´Ö?
 B:$2:A:0:Research item:2000:2000:a:1:0
 B:2:A:0:¥¢¥¤¥Æ¥àÄ´ºº:2000:2000:a:1:0
-?:[IOR [EQU $QUEST5 3] [EQU $QUEST5 4] ]
+?:[EQU $QUEST5 3 4]
 B:$2:A:0:Research item:1000:1000:a:1:0
 B:2:A:0:¥¢¥¤¥Æ¥àÄ´ºº:1000:1000:a:1:0
 ?:1
-B:$2:A:1:Town history:0:0:h:2:0
-B:2:A:1:³¹¤ÎÎò»Ë:0:0:h:2:0
+B:$2:A:1:Town Overview:0:0:h:2:0
+B:2:A:1:³¹¤Î³µÍ×:0:0:h:2:0
 
 B:$3:N:Casino:Materim:Human
 B:3:N:¥«¥¸¥Î:¥Þ¥Æ¥ê¥à:¿Í´Ö
@@ -559,7 +549,7 @@ B:$4:N:Beastmaster:Lorien:Elf
 B:4:N:¥â¥ó¥¹¥¿¡¼Àç¿Í:¥í¥ê¥¨¥ó:¥¨¥ë¥Õ
 B:$4:A:0:Research monster:10000:10000:r:20:0
 B:4:A:0:¥â¥ó¥¹¥¿¡¼Ä´ºº:10000:10000:r:20:0
-?:[IOR [EQU $QUEST5 3] [EQU $QUEST5 4] ]
+?:[EQU $QUEST5 3 4]
 B:$4:A:0:Research monster:1200:1200:r:20:0
 B:4:A:0:¥â¥ó¥¹¥¿¡¼Ä´ºº:1200:1200:r:20:0
 ?:1
@@ -570,7 +560,7 @@ B:$5:A:0:Compare weapons:1000:1000:c:21:0
 B:5:A:0:Éð´ï¤òÈæ³Ó¤¹¤ë:1000:1000:c:21:0
 B:$6:A:1:Evaluate AC:1000:1000:a:46:0
 B:6:A:1:Ëɸæ¤Ë¤Ä¤¤¤ÆÄ´¤Ù¤ë:1000:1000:a:46:0
-?:[IOR [EQU $QUEST5 3] [EQU $QUEST5 4] ]
+?:[EQU $QUEST5 3 4]
 B:$5:A:0:Compare weapons:150:150:c:21:0
 B:5:A:0:Éð´ï¤òÈæ³Ó¤¹¤ë:150:150:c:21:0
 B:$6:A:1:Evaluate AC:150:150:a:46:0
@@ -583,8 +573,8 @@ B:$6:A:0:Enchant weapon:400:800:w:23:0
 B:6:A:0:Éð´ï¤ò¶¯²½¤¹¤ë:400:800:w:23:0
 B:$6:A:1:Enchant armor:300:600:a:24:0
 B:6:A:1:Ëɶñ¤ò¶¯²½¤¹¤ë:300:600:a:24:0
-B:$6:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0
-B:6:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0
+B:$6:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:0
+B:6:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:0
 
 B:$7:N:Temple of Life:Crysania:Human
 B:7:N:À¸Ì¿Ëâ½Ñ¤ÎÅã:¥¯¥ê¥µ¥Ë¥¢:¿Í´Ö
@@ -597,14 +587,12 @@ B:7:M:2:0:0:0:0:0:0:0:0:0
 
 B:$8:N:Thieves Guild:Lardbottom:Hobbit
 B:8:N:Åð±¤Î¥®¥ë¥É:¥é¡¼¥É¥Ü¥È¥à:¥Û¥Ó¥Ã¥È
-B:$8:A:0:Get share of stolen gold:0:0:s:7:2
-B:8:A:0:Åð¤ó¤À¶â¤ò»³Ê¬¤±¤¹¤ë:0:0:s:7:2
 B:$8:A:1:Rest for the night:0:100:r:17:0
 B:8:A:1:°ìÇñ¤¹¤ë:0:100:r:17:0
 B:$8:A:2:Identify possessions:100:2000:i:26:0
 B:8:A:2:»ý¤ÁʪÁ´¤Æ¤ò´ÕÄê:100:2000:i:26:0
-B:$8:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0
-B:8:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0
+B:$8:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0
+B:8:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0
 
 B:$9:N:Archers Guild:Trallin:Half-elf
 B:9:N:¥¢¡¼¥Á¥ã¡¼¤Î¥®¥ë¥É:¥È¥¥¥é¥ê¥ó:¥Ï¡¼¥Õ¥¨¥ë¥Õ
@@ -612,8 +600,8 @@ B:$9:A:0:Enchant missiles:20:40:a:30:0
 B:9:A:0:Ìð¤äÀÐÅù¤ò¶¯²½¤¹¤ë:20:40:a:30:0
 B:$9:A:1:Enchant bow:400:800:b:31:0
 B:9:A:1:µÝ¤ò¶¯²½¤¹¤ë:400:800:b:31:0
-B:$9:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0
-B:9:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0
+B:$9:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:2
+B:9:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:2
 
 B:$10:N:Paladins Guild:Langordathur:Human
 B:10:N:¥Ñ¥é¥Ç¥£¥ó¤Î¥®¥ë¥É:¥é¥ó¥´¥ë¥À¥¹¡¼¥ë:¿Í´Ö
@@ -621,8 +609,8 @@ B:$10:A:0:Enchant armor:300:600:a:24:0
 B:10:A:0:Ëɶñ¤ò¶¯²½¤¹¤ë:300:600:a:24:0
 B:$10:A:1:See Healers:0:200:h:28:0
 B:10:A:1:¼£ÎŲȤ˲ñ¤¦:0:200:h:28:0
-B:$10:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0
-B:10:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0
+B:$10:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0
+B:10:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0
 
 B:$11:N:Tower of Sorcery:Tanistil:Elf
 B:11:N:Àç½Ñ¤ÎÅã:¥¿¥Ë¥¹¥Æ¥£¥ë:¥¨¥ë¥Õ
@@ -732,7 +720,7 @@ D:#TTTTTTTTTTTTTTWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT---.,WWWWWWWWWWWWWWWW
 D:#TTTTTTTTTTVVWWTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT------.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTTT#
 D:#TTTTTTTTTVWWVTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-------.............................................................................----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
 D:#TTTTTTTTTWWWWTTTTTTTTTTTTTTTTTTTTTTTTT...............---------------------------------------------------------------------------------------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
-D:#TTTTTTTTWWWWWWTyTTTTT..................TTTTTTTTTTTTTTTT----------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-TTTTTTTTTTTTTTT-----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
+D:#TTTTTTTTWWWWWWTTTTTTT..................TTTTTTTTTTTTTTTT----------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-TTTTTTTTTTTTTTT-----TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
 D:#TTTTTTTVWWWWWWWW......TTTTTTTTT.TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT.TTTTTTTTT#
 D:#TTTTTTVWWWWWWWWWWV---TTTTTTTTTT.TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-T###TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTw^^^^TTTTT#
 D:#TTTTTTWWWWWWWWWWWWv-TTTTTTTTTTT(TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT-#####TTTTTTTTTTTTTTTTTTTTTTTTTT########TTTTTTTTTTTTTTTTTTTTTTTTT^^^^^^^^^TTT#
@@ -783,10 +771,6 @@ P:30:15
 ?:[EQU $LEAVING_QUEST 7]
 P:30:15
 
-# Starting position when coming from quest 18
-?:[EQU $LEAVING_QUEST 18]
-P:56:17
-
 # Starting position when coming from quest 10
 ?:[EQU $LEAVING_QUEST 10]
 P:58:19