From b2417e8c34af591001d48825d61b0f5d64fd1705 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 27 Oct 2007 00:26:35 +0000
Subject: [PATCH] Synchronize with branch - maps names and map difficulty
 settings

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7398 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/oldcity/oldcity54    | 3 ++-
 scorn/shops/coffeeshop     | 1 +
 scorn/shops/scorn.sale2    | 1 +
 scorn/taverns/barking_mule | 1 +
 sisters/necro_ruin1        | 3 ++-
 sisters/small_manor2       | 3 ++-
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/scorn/oldcity/oldcity54 b/scorn/oldcity/oldcity54
index 51ad85a14..ffe263b1e 100644
--- a/scorn/oldcity/oldcity54
+++ b/scorn/oldcity/oldcity54
@@ -1,5 +1,6 @@
 arch map
-name <untitled>
+name Old City
+difficulty 1
 region scornoldcity
 width 40
 height 40
diff --git a/scorn/shops/coffeeshop b/scorn/shops/coffeeshop
index e3fa8f0f5..98498f98b 100644
--- a/scorn/shops/coffeeshop
+++ b/scorn/shops/coffeeshop
@@ -1,5 +1,6 @@
 arch map
 name Eswald's Coffee Shop
+difficulty 1
 region scorn
 width 10
 height 10
diff --git a/scorn/shops/scorn.sale2 b/scorn/shops/scorn.sale2
index 957cd3807..0772c6531 100644
--- a/scorn/shops/scorn.sale2
+++ b/scorn/shops/scorn.sale2
@@ -1,5 +1,6 @@
 arch map
 name Scorn Pawn Shop
+difficulty 1
 region scorn
 width 21
 height 20
diff --git a/scorn/taverns/barking_mule b/scorn/taverns/barking_mule
index 7e31e20ae..56433c2db 100644
--- a/scorn/taverns/barking_mule
+++ b/scorn/taverns/barking_mule
@@ -1,5 +1,6 @@
 arch map
 name The Barking Mule
+difficulty 1
 region scorn
 width 24
 height 17
diff --git a/sisters/necro_ruin1 b/sisters/necro_ruin1
index c1085f897..add869b78 100644
--- a/sisters/necro_ruin1
+++ b/sisters/necro_ruin1
@@ -1,5 +1,6 @@
 arch map
-name necro_ruin1
+name The Necropolis of Gax
+difficulty 1
 width 25
 height 30
 msg
diff --git a/sisters/small_manor2 b/sisters/small_manor2
index ccaa23241..0920f8572 100644
--- a/sisters/small_manor2
+++ b/sisters/small_manor2
@@ -1,5 +1,6 @@
 arch map
-name small_manor2
+name Small Manor
+difficulty 1
 width 20
 height 20
 msg