Add Keep fix and report

artyomtrityak · Sep 24, 2021 · 96c93d8 · 96c93d8
1 parent 82e08f8
commit 96c93d8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/gamedata.cpp b/gamedata.cpp
@@ -3984,7 +3984,7 @@ static ObjectType ot[] =
 	// JT
 	// Added Abyss Lair
 	{"Black Keep",
-	 ObjectType::NOMONSTERGROWTH | ObjectType::NEVERDECAY,
+	 ObjectType::CANENTER | ObjectType::CANMODIFY,
 	 0,0,0,0,
 	 I_ROOTSTONE,1000,"BUIL",5,
 	 0,0,0,

diff --git a/neworigins_v2/extra.cpp b/neworigins_v2/extra.cpp
@@ -735,29 +735,28 @@ Faction *Game::CheckVictory()
 
 
 	// Check for BLACK KEEP
-	// {
-	// 	forlist_reuse(&regions) {
-	// 		r = (ARegion *) elem;
-	// 		forlist(&r->objects) {
-	// 			o = (Object *) elem;
-	// 			if (o->type == O_BKEEP) {
-	// 				if (!o->incomplete) {
-	// 					// message = "A blasphemous tower has been completed!\n\n"
-	// 					// 	"The connection between Havilah and the Eternal City has been severed.\n\n"
-	// 					// 	"The light fails; darkness falls forever, and all life perishes under endless ice.";
-	// 					// WriteTimesArticle(message);
-	// 					// return GetFaction(&factions, monfaction);
-	// 					message = "A blasphemous tower has been built at (x,y)!";
-	// 					WriteTimesArticle(message);
-	// 				}
-	// 				if (o->incomplete) {
-	// 					message = AString("A blasphemous tower is building at (x,y)! Progress (") + AString(ObjectDefs[o->type].cost - o->incomplete) + AString(" / ") + AString(ObjectDefs[o->type].cost) + AString(")...");
-	// 					WriteTimesArticle(message);
-	// 				}
-	// 			}
-	// 		}
-	// 	}
-	// }
+	{
+		forlist_reuse(&regions) {
+			r = (ARegion *) elem;
+			forlist(&r->objects) {
+				o = (Object *) elem;
+				if (o->type == O_BKEEP) {
+					if (!o->incomplete) {
+						message = "A Black Keep has been built at in the ";
+						message += r->ShortPrint(&regions);
+						message += "!";
+						WriteTimesArticle(message);
+					}
+					if (o->incomplete) {
+						message = AString("A Black Keep is building at ");
+						message += r->ShortPrint(&regions);
+						message += AString("! Progress ") + AString(ObjectDefs[o->type].cost - o->incomplete) + AString(" / ") + AString(ObjectDefs[o->type].cost) + AString(")...");
+						WriteTimesArticle(message);
+					}
+				}
+			}
+		}
+	}
 
 	return NULL;
 }