From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 3 May 2013 07:02:58 +0000 (+0200)
Subject: break: Honor new designation of sanctuaries
X-Git-Tag: v4.3.32~17
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=4c68d14cc0d207654833ffb03220fda5bb6ee6cd

break: Honor new designation of sanctuaries

Breaking sanctuary turns 100% sanctuaries into capitals, all others
into highways.  Before Empire 3, sanctuaries always became capitals.

Give deities more control over initial state of countries than
choosing between 100% capital and <100% highway sectors: turn
sanctuaries into their new designation on break.  Except make a
capital when the new designation is sanctuary (which it normally is).

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---

diff --git a/info/break.t b/info/break.t
index c2340602c..a4012316e 100644
--- a/info/break.t
+++ b/info/break.t
@@ -8,7 +8,8 @@ They also can't be attacked.
 .s1
 Break removes the sanctuary protection from your country and forces
 your people to work for a living.
-Sanctuaries become capitals if they are 100% efficient, else highways.
+Sanctuaries become capitals, unless the deity set up a different new
+designation.
 You can't do any country development commands until you break out
 of sanctuary.
 .s1
diff --git a/src/lib/subs/bsanct.c b/src/lib/subs/bsanct.c
index 70753d7ae..6f435e8f1 100644
--- a/src/lib/subs/bsanct.c
+++ b/src/lib/subs/bsanct.c
@@ -57,13 +57,9 @@ bsanct(void)
 	    continue;
 	pr("%s is no longer a sanctuary.\n",
 	   xyas(s.sct_x, s.sct_y, player->cnum));
-	if (s.sct_effic == 100) {
-	    s.sct_type = SCT_CAPIT;
+	if (s.sct_newtype == SCT_SANCT)
 	    s.sct_newtype = SCT_CAPIT;
-	} else {
-	    s.sct_type = SCT_HIWAY;
-	    s.sct_newtype = SCT_HIWAY;
-	}
+	s.sct_type = s.sct_newtype;
 	game_tick_to_now(&s.sct_access);
 	(void)putsect(&s);
 	count++;