mirror of
https://github.com/Cubitect/cubiomes.git
synced 2025-09-24 04:03:39 -04:00
Updated biome tables to include bamboo_jungles.
This commit is contained in:
Cubitect
parent
efa8e29581
commit
2a1c47f51f
25
finders.c
25
finders.c
@ -2490,6 +2490,8 @@ void genPotential(uint64_t *mL, uint64_t *mM, int layer, int mc, int id)
|
||||
if (!isOverworldBiome(mc, id))
|
||||
return;
|
||||
|
||||
int i;
|
||||
|
||||
switch (layer)
|
||||
{
|
||||
case L_SPECIAL_1024: // biomes added in (L_SPECIAL_1024, L_ADD_MUSHROOM_256]
|
||||
@ -2550,6 +2552,10 @@ void genPotential(uint64_t *mL, uint64_t *mM, int layer, int mc, int id)
|
||||
break;
|
||||
|
||||
case L_BIOME_256: // biomes added in (L_BIOME_256, L_BIOME_EDGE_64]
|
||||
for (i = sizeof(BIOMES_L_BIOME_256) / sizeof(int); i >= 0; i--)
|
||||
if (BIOMES_L_BIOME_256[i] == id)
|
||||
break;
|
||||
if (i < 0) break;
|
||||
if (mc >= MC_1_14 && id == jungle)
|
||||
genPotential(mL, mM, L_BIOME_EDGE_64, mc, bamboo_jungle);
|
||||
if (id == wooded_badlands_plateau || id == badlands_plateau)
|
||||
@ -2558,8 +2564,7 @@ void genPotential(uint64_t *mL, uint64_t *mM, int layer, int mc, int id)
|
||||
genPotential(mL, mM, L_BIOME_EDGE_64, mc, taiga);
|
||||
else if (id == desert)
|
||||
genPotential(mL, mM, L_BIOME_EDGE_64, mc, wooded_mountains);
|
||||
else if (id == swamp)
|
||||
{
|
||||
else if (id == swamp) {
|
||||
genPotential(mL, mM, L_BIOME_EDGE_64, mc, jungle_edge);
|
||||
genPotential(mL, mM, L_BIOME_EDGE_64, mc, plains);
|
||||
}
|
||||
@ -2567,6 +2572,10 @@ void genPotential(uint64_t *mL, uint64_t *mM, int layer, int mc, int id)
|
||||
break;
|
||||
|
||||
case L_BIOME_EDGE_64: // biomes added in (L_BIOME_EDGE_64, L_HILLS_64]
|
||||
for (i = sizeof(BIOMES_L_BIOME_EDGE_64) / sizeof(int); i >= 0; i--)
|
||||
if (BIOMES_L_BIOME_EDGE_64[i] == id)
|
||||
break;
|
||||
if (i < 0) break;
|
||||
if (!isShallowOcean(id) && biomes[id].mutated > 0)
|
||||
genPotential(mL, mM, L_HILLS_64, mc, biomes[id].mutated);
|
||||
switch (id)
|
||||
@ -2633,12 +2642,20 @@ void genPotential(uint64_t *mL, uint64_t *mM, int layer, int mc, int id)
|
||||
break;
|
||||
|
||||
case L_HILLS_64: // biomes added in (L_HILLS_64, L_RARE_BIOME_64]
|
||||
for (i = sizeof(BIOMES_L_HILLS_64) / sizeof(int); i >= 0; i--)
|
||||
if (BIOMES_L_HILLS_64[i] == id)
|
||||
break;
|
||||
if (i < 0) break;
|
||||
if (id == plains)
|
||||
genPotential(mL, mM, L_RARE_BIOME_64, mc, sunflower_plains);
|
||||
genPotential(mL, mM, L_RARE_BIOME_64, mc, id);
|
||||
break;
|
||||
|
||||
case L_RARE_BIOME_64: // biomes added in (L_RARE_BIOME_64, L_SHORE_16]
|
||||
for (i = sizeof(BIOMES_L_HILLS_64) / sizeof(int); i >= 0; i--)
|
||||
if (BIOMES_L_HILLS_64[i] == id)
|
||||
break;
|
||||
if (i < 0 || id == sunflower_plains) break;
|
||||
if (id == mushroom_fields)
|
||||
genPotential(mL, mM, L_SHORE_16, mc, mushroom_field_shore);
|
||||
else if (getBiomeType(id) == Jungle) {
|
||||
@ -2657,6 +2674,10 @@ void genPotential(uint64_t *mL, uint64_t *mM, int layer, int mc, int id)
|
||||
break;
|
||||
|
||||
case L_SHORE_16: // biomes added in (L_SHORE_16, L_RIVER_MIX_4]
|
||||
for (i = sizeof(BIOMES_L_SHORE_16) / sizeof(int); i >= 0; i--)
|
||||
if (BIOMES_L_SHORE_16[i] == id)
|
||||
break;
|
||||
if (i < 0) break;
|
||||
if (id == snowy_tundra)
|
||||
genPotential(mL, mM, L_RIVER_MIX_4, mc, frozen_river);
|
||||
if (id == mushroom_fields || id == mushroom_field_shore)
|
||||
|
||||
71
generator.h
71
generator.h
@ -131,7 +131,6 @@ int genArea(const Layer *layer, int *out, int areaX, int areaZ, int areaWidth, i
|
||||
|
||||
|
||||
|
||||
|
||||
static inline int isOverworldBiome(int mc, int id)
|
||||
{
|
||||
// check if the biome actually generates in this version
|
||||
@ -154,32 +153,9 @@ static inline int isOverworldBiome(int mc, int id)
|
||||
* also contain these biomes.
|
||||
*/
|
||||
|
||||
//==============================================================================
|
||||
// MC 1.13 Biome Tables
|
||||
//==============================================================================
|
||||
|
||||
static const int BIOMES_L13_OCEAN_TEMP_256[] =
|
||||
{
|
||||
ocean, frozen_ocean, warm_ocean, lukewarm_ocean, cold_ocean
|
||||
};
|
||||
|
||||
static const int BIOMES_L13_OCEAN_MIX_4[] =
|
||||
{
|
||||
ocean, plains, desert, mountains, forest, taiga, swamp, river, /*hell, sky,*/ // 0-9
|
||||
frozen_ocean, frozen_river, snowy_tundra, snowy_mountains, mushroom_fields, mushroom_field_shore, beach, desert_hills, wooded_hills, taiga_hills, // 10-19
|
||||
/*mountain_edge,*/ jungle, jungle_hills, jungleEdge, deep_ocean, stone_shore, snowy_beach, birch_forest, birch_forest_hills, dark_forest, // 20-29
|
||||
snowy_taiga, snowy_taiga_hills, giant_tree_taiga, giant_tree_taiga_hills, wooded_mountains, savanna, savanna_plateau, badlands, wooded_badlands_plateau, badlands_plateau, // 30-39
|
||||
/*skyIslandLow, skyIslandMedium, skyIslandHigh, skyIslandBarren,*/ warm_ocean, lukewarm_ocean, cold_ocean, /*deep_warm_ocean,*/ deep_lukewarm_ocean, deep_cold_ocean, // 40-49
|
||||
deep_frozen_ocean,
|
||||
// Modified variants...
|
||||
plains+128, desert+128, mountains+128, forest+128, taiga+128, swamp+128,
|
||||
snowy_tundra+128, jungle+128, jungleEdge+128, birch_forest+128, birch_forest_hills+128, dark_forest+128,
|
||||
snowy_taiga+128, giant_tree_taiga+128, giant_tree_taiga_hills+128, wooded_mountains+128, savanna+128, savanna_plateau+128, badlands+128, wooded_badlands_plateau+128, badlands_plateau+128
|
||||
};
|
||||
|
||||
|
||||
//==============================================================================
|
||||
// MC 1.7 Biome Tables
|
||||
// MC Biome Tables
|
||||
//==============================================================================
|
||||
|
||||
/* L_ADD_MUSHROOM_ISLAND_256 and L_DEEP_OCEAN_256
|
||||
@ -204,41 +180,50 @@ static const int BIOMES_L_BIOME_256[] =
|
||||
snowy_taiga, /*snowy_taiga_hills,*/ giant_tree_taiga, /*giant_tree_taiga_hills, wooded_mountains,*/ savanna, /*savanna_plateau, badlands,*/ wooded_badlands_plateau, badlands_plateau, // 30-39
|
||||
};
|
||||
|
||||
// Introduces biomes: jungleEdge, wooded_mountains, badlands
|
||||
// Introduces biomes: jungle_edge, wooded_mountains, badlands
|
||||
// Inherits new biomes: bamboo_jungle
|
||||
static const int BIOMES_L_BIOME_EDGE_64[] =
|
||||
{
|
||||
ocean, plains, desert, mountains, forest, taiga, swamp, /*river, hell, sky,*/ // 0-9
|
||||
/*frozen_ocean, frozen_river,*/ snowy_tundra, /*snowy_mountains,*/ mushroom_fields, /*mushroom_field_shore, beach, desert_hills, wooded_hills, taiga_hills,*/ // 10-19
|
||||
/*mountain_edge,*/ jungle, /*jungle_hills,*/ jungleEdge, deep_ocean, /*stone_shore, snowy_beach,*/ birch_forest, /*birch_forest_hills,*/ dark_forest, // 20-29
|
||||
/*mountain_edge,*/ jungle, /*jungle_hills,*/ jungle_edge, deep_ocean, /*stone_shore, snowy_beach,*/ birch_forest, /*birch_forest_hills,*/ dark_forest, // 20-29
|
||||
snowy_taiga, /*snowy_taiga_hills,*/ giant_tree_taiga, /*giant_tree_taiga_hills,*/ wooded_mountains, savanna, /*savanna_plateau,*/ badlands, wooded_badlands_plateau, badlands_plateau, // 30-39
|
||||
bamboo_jungle, // 168
|
||||
};
|
||||
|
||||
// Introduces biomes: snowy_mountains, desert_hills, wooded_hills, taiga_hills,
|
||||
// jungle_hills, birch_forest_hills, snowy_taiga_hills, giant_tree_taiga_hills, savanna_plateau
|
||||
// jungle_hills, birch_forest_hills, snowy_taiga_hills, giant_tree_taiga_hills, savanna_plateau,
|
||||
// bamboo_jungle_hills
|
||||
// and all 21 mutated biomes
|
||||
static const int BIOMES_L_HILLS_64[] =
|
||||
{
|
||||
ocean, plains, desert, mountains, forest, taiga, swamp, /*river, hell, sky,*/ // 0-9
|
||||
/*frozen_ocean, frozen_river,*/ snowy_tundra, snowy_mountains, mushroom_fields, /*mushroom_field_shore, beach,*/ desert_hills, wooded_hills, taiga_hills, // 10-19
|
||||
/*mountain_edge,*/ jungle, jungle_hills, jungleEdge, deep_ocean, /*stone_shore, snowy_beach,*/ birch_forest, birch_forest_hills, dark_forest, // 20-29
|
||||
/*mountain_edge,*/ jungle, jungle_hills, jungle_edge, deep_ocean, /*stone_shore, snowy_beach,*/ birch_forest, birch_forest_hills, dark_forest, // 20-29
|
||||
snowy_taiga, snowy_taiga_hills, giant_tree_taiga, giant_tree_taiga_hills, wooded_mountains, savanna, savanna_plateau, badlands, wooded_badlands_plateau, badlands_plateau, // 30-39
|
||||
|
||||
// Modified variants...
|
||||
plains+128, desert+128, mountains+128, forest+128, taiga+128, swamp+128,
|
||||
snowy_tundra+128, jungle+128, jungleEdge+128, birch_forest+128, birch_forest_hills+128, dark_forest+128,
|
||||
snowy_taiga+128, giant_tree_taiga+128, giant_tree_taiga_hills+128, wooded_mountains+128, savanna+128, savanna_plateau+128, badlands+128, wooded_badlands_plateau+128, badlands_plateau+128
|
||||
snowy_taiga+128, giant_tree_taiga+128, giant_tree_taiga_hills+128, wooded_mountains+128, savanna+128, savanna_plateau+128, badlands+128, wooded_badlands_plateau+128, badlands_plateau+128,
|
||||
|
||||
bamboo_jungle, bamboo_jungle_hills, // 168, 169
|
||||
};
|
||||
|
||||
// Introduces biomes: mushroom_field_shore, beach, stone_shore, snowy_beach
|
||||
// Inherits new biiomes: sunflower_plains
|
||||
static const int BIOMES_L_SHORE_16[] =
|
||||
{
|
||||
ocean, plains, desert, mountains, forest, taiga, swamp, /*river, hell, sky,*/ // 0-9
|
||||
/*frozen_ocean, frozen_river,*/ snowy_tundra, snowy_mountains, mushroom_fields, mushroom_field_shore, beach, desert_hills, wooded_hills, taiga_hills, // 10-19
|
||||
/*mountain_edge,*/ jungle, jungle_hills, jungleEdge, deep_ocean, stone_shore, snowy_beach, birch_forest, birch_forest_hills, dark_forest, // 20-29
|
||||
/*mountain_edge,*/ jungle, jungle_hills, jungle_edge, deep_ocean, stone_shore, snowy_beach, birch_forest, birch_forest_hills, dark_forest, // 20-29
|
||||
snowy_taiga, snowy_taiga_hills, giant_tree_taiga, giant_tree_taiga_hills, wooded_mountains, savanna, savanna_plateau, badlands, wooded_badlands_plateau, badlands_plateau, // 30-39
|
||||
// Modified variants...
|
||||
plains+128, desert+128, mountains+128, forest+128, taiga+128, swamp+128,
|
||||
snowy_tundra+128, jungle+128, jungleEdge+128, birch_forest+128, birch_forest_hills+128, dark_forest+128,
|
||||
snowy_taiga+128, giant_tree_taiga+128, giant_tree_taiga_hills+128, wooded_mountains+128, savanna+128, savanna_plateau+128, badlands+128, wooded_badlands_plateau+128, badlands_plateau+128
|
||||
snowy_taiga+128, giant_tree_taiga+128, giant_tree_taiga_hills+128, wooded_mountains+128, savanna+128, savanna_plateau+128, badlands+128, wooded_badlands_plateau+128, badlands_plateau+128,
|
||||
|
||||
bamboo_jungle, bamboo_jungle_hills, // 168, 169
|
||||
};
|
||||
|
||||
// Merges the river branch and adds frozen_river biome
|
||||
@ -246,14 +231,32 @@ static const int BIOMES_L_RIVER_MIX_4[] =
|
||||
{
|
||||
ocean, plains, desert, mountains, forest, taiga, swamp, river, /*hell, sky,*/ // 0-9
|
||||
/*frozen_ocean,*/ frozen_river, snowy_tundra, snowy_mountains, mushroom_fields, mushroom_field_shore, beach, desert_hills, wooded_hills, taiga_hills, // 10-19
|
||||
/*mountain_edge,*/ jungle, jungle_hills, jungleEdge, deep_ocean, stone_shore, snowy_beach, birch_forest, birch_forest_hills, dark_forest, // 20-29
|
||||
/*mountain_edge,*/ jungle, jungle_hills, jungle_edge, deep_ocean, stone_shore, snowy_beach, birch_forest, birch_forest_hills, dark_forest, // 20-29
|
||||
snowy_taiga, snowy_taiga_hills, giant_tree_taiga, giant_tree_taiga_hills, wooded_mountains, savanna, savanna_plateau, badlands, wooded_badlands_plateau, badlands_plateau, // 30-39
|
||||
// Modified variants...
|
||||
plains+128, desert+128, mountains+128, forest+128, taiga+128, swamp+128,
|
||||
snowy_tundra+128, jungle+128, jungleEdge+128, birch_forest+128, birch_forest_hills+128, dark_forest+128,
|
||||
snowy_taiga+128, giant_tree_taiga+128, giant_tree_taiga_hills+128, wooded_mountains+128, savanna+128, savanna_plateau+128, badlands+128, wooded_badlands_plateau+128, badlands_plateau+128
|
||||
snowy_taiga+128, giant_tree_taiga+128, giant_tree_taiga_hills+128, wooded_mountains+128, savanna+128, savanna_plateau+128, badlands+128, wooded_badlands_plateau+128, badlands_plateau+128,
|
||||
|
||||
bamboo_jungle, bamboo_jungle_hills, // 168, 169
|
||||
};
|
||||
|
||||
// Merges ocean variants
|
||||
static const int BIOMES_L13_OCEAN_MIX_4[] =
|
||||
{
|
||||
ocean, plains, desert, mountains, forest, taiga, swamp, river, /*hell, sky,*/ // 0-9
|
||||
frozen_ocean, frozen_river, snowy_tundra, snowy_mountains, mushroom_fields, mushroom_field_shore, beach, desert_hills, wooded_hills, taiga_hills, // 10-19
|
||||
/*mountain_edge,*/ jungle, jungle_hills, jungle_edge, deep_ocean, stone_shore, snowy_beach, birch_forest, birch_forest_hills, dark_forest, // 20-29
|
||||
snowy_taiga, snowy_taiga_hills, giant_tree_taiga, giant_tree_taiga_hills, wooded_mountains, savanna, savanna_plateau, badlands, wooded_badlands_plateau, badlands_plateau, // 30-39
|
||||
/*skyIslandLow, skyIslandMedium, skyIslandHigh, skyIslandBarren,*/ warm_ocean, lukewarm_ocean, cold_ocean, /*deep_warm_ocean,*/ deep_lukewarm_ocean, deep_cold_ocean, // 40-49
|
||||
deep_frozen_ocean,
|
||||
// Modified variants...
|
||||
plains+128, desert+128, mountains+128, forest+128, taiga+128, swamp+128,
|
||||
snowy_tundra+128, jungle+128, jungleEdge+128, birch_forest+128, birch_forest_hills+128, dark_forest+128,
|
||||
snowy_taiga+128, giant_tree_taiga+128, giant_tree_taiga_hills+128, wooded_mountains+128, savanna+128, savanna_plateau+128, badlands+128, wooded_badlands_plateau+128, badlands_plateau+128,
|
||||
|
||||
bamboo_jungle, bamboo_jungle_hills, // 168, 169
|
||||
};
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user