summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-03-28 17:35:05 +0100
committermadmaxoft <github@xoft.cz>2014-03-28 17:35:05 +0100
commit113343d336e28613f344aa43cf654baa177463f6 (patch)
tree5c648dbebf3fd2172106d93c029d6c256ddd25b7
parentFixed a memory leak in NetherFortGen. (diff)
downloadcuberite-113343d336e28613f344aa43cf654baa177463f6.tar
cuberite-113343d336e28613f344aa43cf654baa177463f6.tar.gz
cuberite-113343d336e28613f344aa43cf654baa177463f6.tar.bz2
cuberite-113343d336e28613f344aa43cf654baa177463f6.tar.lz
cuberite-113343d336e28613f344aa43cf654baa177463f6.tar.xz
cuberite-113343d336e28613f344aa43cf654baa177463f6.tar.zst
cuberite-113343d336e28613f344aa43cf654baa177463f6.zip
-rw-r--r--src/Generating/Prefabs/NetherFortPrefabs.cpp187
1 files changed, 158 insertions, 29 deletions
diff --git a/src/Generating/Prefabs/NetherFortPrefabs.cpp b/src/Generating/Prefabs/NetherFortPrefabs.cpp
index 29df15c1f..6d6b11cdd 100644
--- a/src/Generating/Prefabs/NetherFortPrefabs.cpp
+++ b/src/Generating/Prefabs/NetherFortPrefabs.cpp
@@ -20,6 +20,7 @@ The nether fortress has two types of connectors, Outer and Inner. Outer is Type
const cPrefab::sDef g_NetherFortPrefabs1[] =
{
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// BalconyCorridor:
// The data has been exported from gallery Nether, area index 37, ID 288
{
@@ -38,7 +39,7 @@ const cPrefab::sDef g_NetherFortPrefabs1[] =
"i:114: 3\n" /* netherbrickstairs */
"j:114: 0\n" /* netherbrickstairs */
"k:114: 1\n" /* netherbrickstairs */
- "l: 0: 0\n" /* air */,
+ ".: 0: 0\n" /* air */,
// Block data:
// Level 1
@@ -57,7 +58,7 @@ const cPrefab::sDef g_NetherFortPrefabs1[] =
"aaaaaaaaaaaaa"
"aaaaaaaaaaaaa"
"aaaaaaaaaaaaa"
- "aaaalaaalaaaa"
+ "aaaa.aaa.aaaa"
"bbcdaaaaadebb"
"bbbcdddddebbb"
"bbbbbbbbbbbbb"
@@ -65,10 +66,10 @@ const cPrefab::sDef g_NetherFortPrefabs1[] =
// Level 3
"aaaaaaaaaaaaa"
- "lllllllllllll"
- "lllllllllllll"
- "lllllllllllll"
- "aaaalffflaaaa"
+ "............."
+ "............."
+ "............."
+ "aaaa.fff.aaaa"
"bbaaaaaaaaabb"
"bbaaaaaaaaabb"
"bbaaaaaaaaabb"
@@ -76,36 +77,36 @@ const cPrefab::sDef g_NetherFortPrefabs1[] =
// Level 4
"agagagagagaga"
- "lllllllllllll"
- "lllllllllllll"
- "lllllllllllll"
- "agaalllllaaga"
- "bbaaalllaaabb"
- "bbglllllllgbb"
- "bbglllllllgbb"
+ "............."
+ "............."
+ "............."
+ "agaa.....aaga"
+ "bbaaa...aaabb"
+ "bbg.......gbb"
+ "bbg.......gbb"
"bbgggggggggbb"
// Level 5
"agagagagagaga"
- "lllllllllllll"
- "lllllllllllll"
- "lllllllllllll"
- "agaalllllaaga"
- "bbaaalllaaabb"
- "bblllllllllbb"
- "bblllllllllbb"
- "bblllllllllbb"
+ "............."
+ "............."
+ "............."
+ "agaa.....aaga"
+ "bbaaa...aaabb"
+ "bb.........bb"
+ "bb.........bb"
+ "bb.........bb"
// Level 6
"agagagagagaga"
- "lllllllllllll"
- "lllllllllllll"
- "lllllllllllll"
- "agaalllllaaga"
- "bbaaalllaaabb"
- "bblllllllllbb"
- "bblllllllllbb"
- "bblllllllllbb"
+ "............."
+ "............."
+ "............."
+ "agaa.....aaga"
+ "bbaaa...aaabb"
+ "bb.........bb"
+ "bb.........bb"
+ "bb.........bb"
// Level 7
"hhhhhhhhhhhhh"
@@ -127,7 +128,134 @@ const cPrefab::sDef g_NetherFortPrefabs1[] =
// Merge strategy:
cBlockArea::msImprint,
+ }, // BalconyCorridor
+
+
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // BalconyTee2:
+ // The data has been exported from gallery Nether, area index 38, ID 289
+ {
+ // Size:
+ 13, 7, 11, // SizeX = 13, SizeY = 7, SizeZ = 11
+
+ // Block definitions:
+ "a: 19: 0\n" /* sponge */
+ "b:112: 0\n" /* netherbrick */
+ "c:114: 4\n" /* netherbrickstairs */
+ "d:114: 7\n" /* netherbrickstairs */
+ "e:114: 5\n" /* netherbrickstairs */
+ "f: 44: 6\n" /* step */
+ "g:113: 0\n" /* netherbrickfence */
+ "h:114: 0\n" /* netherbrickstairs */
+ "i:114: 1\n" /* netherbrickstairs */
+ "j:114: 2\n" /* netherbrickstairs */
+ "k:114: 3\n" /* netherbrickstairs */
+ ".: 0: 0\n" /* air */,
+
+ // Block data:
+ // Level 1
+ "aaaabbbbbaaaa"
+ "aaaabbbbbaaaa"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "aaaabbbbbaaaa"
+ "aaaaaaaaaaaaa"
+ "aaaaaaaaaaaaa"
+ "aaaaaaaaaaaaa"
+
+ // Level 2
+ "aaaabbbbbaaaa"
+ "aaaabbbbbaaaa"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "bbbb.bbb.bbbb"
+ "aacdbbbbbdeaa"
+ "aaacdddddeaaa"
+ "aaaaaaaaaaaaa"
+ "aaaaaaaaaaaaa"
+
+ // Level 3
+ "aaaab...baaaa"
+ "aaaab...baaaa"
+ "bbbbb...bbbbb"
+ "............."
+ "............."
+ "............."
+ "bbbb.fff.bbbb"
+ "aabbbbbbbbbaa"
+ "aabbbbbbbbbaa"
+ "aabbbbbbbbbaa"
+ "aabbbbbbbbbaa"
+
+ // Level 4
+ "aaaab...baaaa"
+ "aaaag...gaaaa"
+ "bgbgb...bgbgb"
+ "............."
+ "............."
+ "............."
+ "bgbb.....bbgb"
+ "aabbb...bbbaa"
+ "aag.......gaa"
+ "aag.......gaa"
+ "aagggggggggaa"
+
+ // Level 5
+ "aaaab...baaaa"
+ "aaaag...gaaaa"
+ "bgbgb...bgbgb"
+ "............."
+ "............."
+ "............."
+ "bgbb.....bbgb"
+ "aabbb...bbbaa"
+ "aa.........aa"
+ "aa.........aa"
+ "aa.........aa"
+
+ // Level 6
+ "aaaab...baaaa"
+ "aaaag...gaaaa"
+ "bgbgb...bgbgb"
+ "............."
+ "............."
+ "............."
+ "bgbb.....bbgb"
+ "aabbb...bbbaa"
+ "aa.........aa"
+ "aa.........aa"
+ "aa.........aa"
+
+ // Level 7
+ "aaaahbbbiaaaa"
+ "aaaahbbbiaaaa"
+ "jjjjjbbbjjjjj"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "bbbbbbbbbbbbb"
+ "kkhbbbbbbbkkk"
+ "aahkkkkkkkiaa"
+ "aaaaaaaaaaaaa"
+ "aaaaaaaaaaaaa"
+ "aaaaaaaaaaaaa",
+
+ // Connections:
+ "1: 0, 2, 4: 4\n" /* Type 1, BLOCK_FACE_XM */
+ "1: 12, 2, 4: 5\n" /* Type 1, BLOCK_FACE_XP */
+ "1: 6, 2, 0: 2\n" /* Type 1, BLOCK_FACE_ZM */,
+
+ // AllowedRotations:
+ 7, /* 1, 2, 3 CCW rotations */
+
+ // Merge strategy:
+ cBlockArea::msImprint,
},
+
} ; // g_NetherFortPrefabs1
@@ -136,6 +264,7 @@ const cPrefab::sDef g_NetherFortPrefabs1[] =
const cPrefab::sDef g_NetherFortStartingPrefabs1[] =
{
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// CentralRoom:
// The data has been exported from gallery Nether, area index 22, ID 164
{