From 54f9d102f66701e8987d6b4d19d0119e93ea8047 Mon Sep 17 00:00:00 2001 From: rjtanner Date: Mon, 22 Oct 2007 23:25:19 +0000 Subject: [PATCH] Synchronize with updates made to branch - map renames git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7384 282e977c-c81d-0410-88c4-b93c2d0d6712 --- planes/greenway1 | 3 ++- planes/greenway2 | 3 ++- planes/greenway3 | 3 ++- planes/greenway4 | 3 ++- planes/greenway5 | 3 ++- planes/greenway6 | 3 ++- planes/greenway7 | 3 ++- planes/greenway8 | 3 ++- planes/greenway9 | 3 ++- port_joseph/goblin/fort2 | 1 + port_joseph/pirates/fortvsship | 1 + port_joseph/pirates/madvillage | 3 ++- port_joseph/pirates/mbgrave | 1 + port_joseph/pirates/mbgrave2 | 1 + port_joseph/pirates/mooglypuzzle | 3 ++- port_joseph/town/churchcrypt | 1 + port_joseph/town/dshark | 1 + port_joseph/town/generalstore | 3 ++- port_joseph/town/portia | 1 + port_joseph/town/portia2 | 1 + port_joseph/town/tomassos_house | 1 + quests/greyshield/GreyMaster | 2 +- quests/mak/dragons/chaos | 2 +- quests/mak/dragons/elec | 2 +- quests/mak/dragons/fire | 2 +- quests/mak/dragons/ice | 2 +- quests/mcz/castle1 | 1 + quests/mcz/castle_earth | 1 + quests/mcz/castle_low1 | 1 + quests/mcz/castle_low2 | 1 + quests/peterm/DragonQuest/ElectricAnte | 2 +- quests/peterm/DragonQuest/ElectricLord | 2 +- quests/peterm/DragonQuest/Entrance | 2 +- quests/peterm/DragonQuest/FireAnte | 2 +- quests/peterm/DragonQuest/FireHatchery | 2 +- quests/peterm/DragonQuest/FireLord | 3 ++- quests/peterm/DragonQuest/IceAnte | 2 +- quests/peterm/DragonQuest/IceHatchery | 2 +- quests/peterm/DragonQuest/IceLord | 3 ++- quests/peterm/DragonQuest/WyvernNest | 3 ++- quests/skud/maze | 3 ++- 41 files changed, 57 insertions(+), 28 deletions(-) diff --git a/planes/greenway1 b/planes/greenway1 index bbd00ef92..804b06097 100644 --- a/planes/greenway1 +++ b/planes/greenway1 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway darkness 1 width 50 diff --git a/planes/greenway2 b/planes/greenway2 index 35b201292..c78428eb6 100644 --- a/planes/greenway2 +++ b/planes/greenway2 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway width 50 height 50 diff --git a/planes/greenway3 b/planes/greenway3 index 158f216dc..0a99b0921 100644 --- a/planes/greenway3 +++ b/planes/greenway3 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway darkness 1 width 50 diff --git a/planes/greenway4 b/planes/greenway4 index 32a83c469..df6354268 100644 --- a/planes/greenway4 +++ b/planes/greenway4 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway width 50 height 50 diff --git a/planes/greenway5 b/planes/greenway5 index 7625589fb..4ae8489ff 100644 --- a/planes/greenway5 +++ b/planes/greenway5 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway width 50 height 50 diff --git a/planes/greenway6 b/planes/greenway6 index 8414c61ad..360d78a8c 100644 --- a/planes/greenway6 +++ b/planes/greenway6 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway width 50 height 50 diff --git a/planes/greenway7 b/planes/greenway7 index d170aec36..5570baea1 100644 --- a/planes/greenway7 +++ b/planes/greenway7 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway width 50 height 50 diff --git a/planes/greenway8 b/planes/greenway8 index c0f80a39b..ff87e4501 100644 --- a/planes/greenway8 +++ b/planes/greenway8 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway darkness 1 width 50 diff --git a/planes/greenway9 b/planes/greenway9 index eeb0186dc..d607a661c 100644 --- a/planes/greenway9 +++ b/planes/greenway9 @@ -1,5 +1,6 @@ arch map -name TheGreenWay +name The Green Way +difficulty 1 region greenway darkness 2 width 50 diff --git a/port_joseph/goblin/fort2 b/port_joseph/goblin/fort2 index 8fef16dc8..7e6da03d4 100644 --- a/port_joseph/goblin/fort2 +++ b/port_joseph/goblin/fort2 @@ -1,5 +1,6 @@ arch map name Goblin Fort +difficulty 1 region portjoseph width 24 height 15 diff --git a/port_joseph/pirates/fortvsship b/port_joseph/pirates/fortvsship index 7870b1240..2b5d550d4 100644 --- a/port_joseph/pirates/fortvsship +++ b/port_joseph/pirates/fortvsship @@ -1,5 +1,6 @@ arch map name Pirate Beach +difficulty 1 region portjoseph width 25 height 30 diff --git a/port_joseph/pirates/madvillage b/port_joseph/pirates/madvillage index fb1b3c4e7..e46d4df81 100644 --- a/port_joseph/pirates/madvillage +++ b/port_joseph/pirates/madvillage @@ -1,5 +1,6 @@ arch map -name Ship wreck village +name Ship Wreck Village +difficulty 1 region portjoseph width 16 height 16 diff --git a/port_joseph/pirates/mbgrave b/port_joseph/pirates/mbgrave index db3c54a8d..fc864514a 100644 --- a/port_joseph/pirates/mbgrave +++ b/port_joseph/pirates/mbgrave @@ -1,5 +1,6 @@ arch map name Moogly Bill's Grave +difficulty 1 region portjoseph darkness 5 width 27 diff --git a/port_joseph/pirates/mbgrave2 b/port_joseph/pirates/mbgrave2 index 7527c4abc..62d5ae173 100644 --- a/port_joseph/pirates/mbgrave2 +++ b/port_joseph/pirates/mbgrave2 @@ -1,5 +1,6 @@ arch map name Moogly Bill's Grave +difficulty 1 region portjoseph darkness 4 width 20 diff --git a/port_joseph/pirates/mooglypuzzle b/port_joseph/pirates/mooglypuzzle index dca2a6be5..5e3e4cfe2 100644 --- a/port_joseph/pirates/mooglypuzzle +++ b/port_joseph/pirates/mooglypuzzle @@ -1,5 +1,6 @@ arch map -name Pirate quest +name Pirate's Puzzle +difficulty 1 region portjoseph darkness 3 width 17 diff --git a/port_joseph/town/churchcrypt b/port_joseph/town/churchcrypt index f4c4254d3..3f4f62e13 100644 --- a/port_joseph/town/churchcrypt +++ b/port_joseph/town/churchcrypt @@ -1,5 +1,6 @@ arch map name Church Crypt +difficulty 1 region portjoseph width 32 height 16 diff --git a/port_joseph/town/dshark b/port_joseph/town/dshark index cde9b6450..4508c51b0 100644 --- a/port_joseph/town/dshark +++ b/port_joseph/town/dshark @@ -1,5 +1,6 @@ arch map name The Drunken Shark +difficulty 1 region portjoseph width 18 height 14 diff --git a/port_joseph/town/generalstore b/port_joseph/town/generalstore index 5045e47bb..287facd48 100644 --- a/port_joseph/town/generalstore +++ b/port_joseph/town/generalstore @@ -1,5 +1,6 @@ arch map -name General store +name General Store +difficulty 1 region portjoseph shopitems weapon:10;food:15;*:-2 shopmax 5000 diff --git a/port_joseph/town/portia b/port_joseph/town/portia index 076084d7c..006ff02b3 100644 --- a/port_joseph/town/portia +++ b/port_joseph/town/portia @@ -1,5 +1,6 @@ arch map name Portia's House +difficulty 1 region portjoseph width 32 height 16 diff --git a/port_joseph/town/portia2 b/port_joseph/town/portia2 index 354f95dde..814c425b2 100644 --- a/port_joseph/town/portia2 +++ b/port_joseph/town/portia2 @@ -1,5 +1,6 @@ arch map name Second Floor of Portia's House +difficulty 1 region portjoseph width 24 height 16 diff --git a/port_joseph/town/tomassos_house b/port_joseph/town/tomassos_house index edbf75da3..7e9f1ac1d 100644 --- a/port_joseph/town/tomassos_house +++ b/port_joseph/town/tomassos_house @@ -1,5 +1,6 @@ arch map name Tomasso's house +difficulty 1 region portjoseph width 25 height 20 diff --git a/quests/greyshield/GreyMaster b/quests/greyshield/GreyMaster index e5438f7c1..a7cb43d19 100644 --- a/quests/greyshield/GreyMaster +++ b/quests/greyshield/GreyMaster @@ -1,5 +1,5 @@ arch map -name Noname +name Grey Master darkness 3 width 32 height 24 diff --git a/quests/mak/dragons/chaos b/quests/mak/dragons/chaos index fdb6b6922..76b5707a3 100644 --- a/quests/mak/dragons/chaos +++ b/quests/mak/dragons/chaos @@ -1,5 +1,5 @@ arch map -name Chaos Dragons Lair +name Chaos Dragons' Lair difficulty 15 width 31 height 35 diff --git a/quests/mak/dragons/elec b/quests/mak/dragons/elec index 8d00aca51..37f4bc862 100644 --- a/quests/mak/dragons/elec +++ b/quests/mak/dragons/elec @@ -1,5 +1,5 @@ arch map -name Electric Dragons Lair +name Electric Dragons' Lair difficulty 1 width 28 height 27 diff --git a/quests/mak/dragons/fire b/quests/mak/dragons/fire index 1945a8b90..0626c498a 100644 --- a/quests/mak/dragons/fire +++ b/quests/mak/dragons/fire @@ -1,5 +1,5 @@ arch map -name Fire Dragons Lair +name Fire Dragons' Lair difficulty 1 width 29 height 31 diff --git a/quests/mak/dragons/ice b/quests/mak/dragons/ice index f75a44a35..36ec55d71 100644 --- a/quests/mak/dragons/ice +++ b/quests/mak/dragons/ice @@ -1,5 +1,5 @@ arch map -name Ice Dragon lair +name Ice Dragons' lair difficulty 1 width 29 height 30 diff --git a/quests/mcz/castle1 b/quests/mcz/castle1 index 29ec7fb00..933a7b873 100644 --- a/quests/mcz/castle1 +++ b/quests/mcz/castle1 @@ -1,5 +1,6 @@ arch map name Castle of Ra-Gar +difficulty 1 width 20 height 27 msg diff --git a/quests/mcz/castle_earth b/quests/mcz/castle_earth index c6e2432a3..b60b26b11 100644 --- a/quests/mcz/castle_earth +++ b/quests/mcz/castle_earth @@ -1,5 +1,6 @@ arch map name Castle Ra-Gar, Level of Earth +difficulty 1 width 9 height 16 msg diff --git a/quests/mcz/castle_low1 b/quests/mcz/castle_low1 index 129b88442..74287a02c 100644 --- a/quests/mcz/castle_low1 +++ b/quests/mcz/castle_low1 @@ -1,5 +1,6 @@ arch map name Dungeon or Ra-Gar +difficulty 1 width 16 height 30 msg diff --git a/quests/mcz/castle_low2 b/quests/mcz/castle_low2 index e29eceead..44407f2e8 100644 --- a/quests/mcz/castle_low2 +++ b/quests/mcz/castle_low2 @@ -1,5 +1,6 @@ arch map name Underneath Castle +difficulty 1 width 30 height 28 msg diff --git a/quests/peterm/DragonQuest/ElectricAnte b/quests/peterm/DragonQuest/ElectricAnte index 8bcf83bc6..c80379038 100644 --- a/quests/peterm/DragonQuest/ElectricAnte +++ b/quests/peterm/DragonQuest/ElectricAnte @@ -1,5 +1,5 @@ arch map -name DragonQuest -- Electric Anteroom +name Electric Anteroom difficulty 1 darkness 5 width 22 diff --git a/quests/peterm/DragonQuest/ElectricLord b/quests/peterm/DragonQuest/ElectricLord index dc2e6008e..d1d5ff8ca 100644 --- a/quests/peterm/DragonQuest/ElectricLord +++ b/quests/peterm/DragonQuest/ElectricLord @@ -1,5 +1,5 @@ arch map -name DragonQuest -- Electric Lord +name Electric Dragon Lord difficulty 1 darkness 5 width 41 diff --git a/quests/peterm/DragonQuest/Entrance b/quests/peterm/DragonQuest/Entrance index 4b88a4719..c5e00835d 100644 --- a/quests/peterm/DragonQuest/Entrance +++ b/quests/peterm/DragonQuest/Entrance @@ -1,5 +1,5 @@ arch map -name DragonQuest -- Entrance +name Entrance difficulty 1 width 27 height 16 diff --git a/quests/peterm/DragonQuest/FireAnte b/quests/peterm/DragonQuest/FireAnte index 6afc39955..01004b709 100644 --- a/quests/peterm/DragonQuest/FireAnte +++ b/quests/peterm/DragonQuest/FireAnte @@ -1,5 +1,5 @@ arch map -name DragonQuest -- Fire Anteroom +name Fire Anteroom difficulty 1 darkness 5 width 22 diff --git a/quests/peterm/DragonQuest/FireHatchery b/quests/peterm/DragonQuest/FireHatchery index ee8c15a2c..707cefa4f 100644 --- a/quests/peterm/DragonQuest/FireHatchery +++ b/quests/peterm/DragonQuest/FireHatchery @@ -1,5 +1,5 @@ arch map -name DragonQuest -- Fire Hatchery +name Fire Hatchery difficulty 1 darkness 5 width 41 diff --git a/quests/peterm/DragonQuest/FireLord b/quests/peterm/DragonQuest/FireLord index fea5d26cf..747591451 100644 --- a/quests/peterm/DragonQuest/FireLord +++ b/quests/peterm/DragonQuest/FireLord @@ -1,5 +1,6 @@ arch map -name DragonQuest--FireLord +name Dragon Fire Lord +difficulty 1 darkness 5 width 16 height 31 diff --git a/quests/peterm/DragonQuest/IceAnte b/quests/peterm/DragonQuest/IceAnte index da609f993..488e33bd4 100644 --- a/quests/peterm/DragonQuest/IceAnte +++ b/quests/peterm/DragonQuest/IceAnte @@ -1,5 +1,5 @@ arch map -name DragonQuest--Ice Anteroom +name Ice Anteroom difficulty 1 darkness 5 width 30 diff --git a/quests/peterm/DragonQuest/IceHatchery b/quests/peterm/DragonQuest/IceHatchery index de5453dbe..955254782 100644 --- a/quests/peterm/DragonQuest/IceHatchery +++ b/quests/peterm/DragonQuest/IceHatchery @@ -1,5 +1,5 @@ arch map -name DragonQuest--Ice Hatchery +name Ice Hatchery difficulty 1 darkness 5 width 16 diff --git a/quests/peterm/DragonQuest/IceLord b/quests/peterm/DragonQuest/IceLord index da95034a7..ad2f1ede1 100644 --- a/quests/peterm/DragonQuest/IceLord +++ b/quests/peterm/DragonQuest/IceLord @@ -1,5 +1,6 @@ arch map -name DragonQuest -- Icelord +name Dragon Ice lord +difficulty 1 darkness 5 width 16 height 30 diff --git a/quests/peterm/DragonQuest/WyvernNest b/quests/peterm/DragonQuest/WyvernNest index 2e0f3a11d..e50b6422d 100644 --- a/quests/peterm/DragonQuest/WyvernNest +++ b/quests/peterm/DragonQuest/WyvernNest @@ -1,5 +1,6 @@ arch map -name DragonQuest--WyvernNest +name Wyvern Nest +difficulty 1 darkness 3 width 40 height 40 diff --git a/quests/skud/maze b/quests/skud/maze index 87fba2ea9..0b5ed6ffe 100644 --- a/quests/skud/maze +++ b/quests/skud/maze @@ -1,5 +1,6 @@ arch map -name maze +name Maze +difficulty 1 width 40 height 40 msg