Windy/cubiomes
1
0
Fork 0
mirror of https://github.com/Cubitect/cubiomes.git synced 2025-04-04 22:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed modified biomes for 1.13.

Browse Source
This commit is contained in:
Cubitect 2018-07-09 01:58:46 +01:00
parent 5b63f2f16c
commit 55946e0ba9
3 changed files with 126 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generator.c
View File

@ -156,7 +156,7 @@ LayerStack setupGeneratorMC113()
setupLayer( 128, &g.layers[23], &g.layers[22], 1000, mapZoom);
setupLayer( 64, &g.layers[24], &g.layers[23], 1001, mapZoom);
setupMultiLayer(64, &g.layers[25], &g.layers[21], &g.layers[24], 1000, mapHills);
setupMultiLayer(64, &g.layers[25], &g.layers[21], &g.layers[24], 1000, mapHills113);
setupLayer( 64, &g.layers[26], &g.layers[25], 1001, mapRareBiome);
setupLayer( 32, &g.layers[27], &g.layers[26], 1000, mapZoom);

123
layers.c
View File

@ -986,6 +986,127 @@ void mapHills(Layer *l, int * __restrict out, int areaX, int areaZ, int areaWidt
}
void mapHills113(Layer *l, int * __restrict out, int areaX, int areaZ, int areaWidth, int areaHeight)
{
int pX = areaX - 1;
int pZ = areaZ - 1;
int pWidth = areaWidth + 2;
int pHeight = areaHeight + 2;
int x, z;
int *buf = NULL;
if(l->p2 == NULL)
{
printf("mapHills() requires two parents! Use setupMultiLayer()\n");
exit(1);
}
buf = (int *) malloc(pWidth*pHeight*sizeof(int));
l->p->getMap(l->p, out, pX, pZ, pWidth, pHeight);
memcpy(buf, out, pWidth*pHeight*sizeof(int));
l->p2->getMap(l->p2, out, pX, pZ, pWidth, pHeight);
for(z = 0; z < areaHeight; z++)
{
for(x = 0; x < areaWidth; x++)
{
setChunkSeed(l, (int64_t)(x + areaX), (int64_t)(z + areaZ));
int a11 = buf[x+1 + (z+1)*pWidth]; // biome branch
int b11 = out[x+1 + (z+1)*pWidth]; // river branch
int idx = x + z*areaWidth;
int bn = (b11 - 2) % 29;
if(!(isOceanic(a11) || b11 < 2 || bn != 1 || a11 >= 128))
{
out[idx] = (biomeExists(a11 + 128)) ? a11 + 128 : a11;
}
else if(mcNextInt(l, 3) == 0 || bn == 0)
{
int hillID = a11;
switch(a11){
case desert:
hillID = desertHills; break;
case forest:
hillID = forestHills; break;
case birchForest:
hillID = birchForestHills; break;
case roofedForest:
hillID = plains; break;
case taiga:
hillID = taigaHills; break;
case megaTaiga:
hillID = megaTaigaHills; break;
case coldTaiga:
hillID = coldTaigaHills; break;
case plains:
hillID = (mcNextInt(l, 3) == 0) ? forestHills : forest; break;
case icePlains:
hillID = iceMountains; break;
case jungle:
hillID = jungleHills; break;
case ocean:
hillID = deepOcean; break;
case extremeHills:
hillID = extremeHillsPlus; break;
case savanna:
hillID = savannaPlateau; break;
default:
if(equalOrPlateau(a11, mesaPlateau_F))
hillID = mesa;
else if((a11 == deepOcean || a11 == lukewarmDeepOcean ||
a11 == coldDeepOcean || a11 == frozenDeepOcean) &&
mcNextInt(l, 3) == 0)
hillID = (mcNextInt(l, 2) == 0) ? plains : forest;
break;
}
if(bn == 0 && hillID != a11)
{
if(biomeExists(hillID + 128))
hillID += 128;
else
hillID = a11;
}
if(hillID != a11)
{
int a10 = buf[x+1 + (z+0)*pWidth];
int a21 = buf[x+2 + (z+1)*pWidth];
int a01 = buf[x+0 + (z+1)*pWidth];
int a12 = buf[x+1 + (z+2)*pWidth];
int equals = 0;
if(equalOrPlateau(a10, a11)) equals++;
if(equalOrPlateau(a21, a11)) equals++;
if(equalOrPlateau(a01, a11)) equals++;
if(equalOrPlateau(a12, a11)) equals++;
if(equals >= 3)
out[idx] = hillID;
else
out[idx] = a11;
}
else
{
out[idx] = a11;
}
}
else
{
out[idx] = a11;
}
}
}
free(buf);
}
static inline int reduceID(int id)
{
return id >= 2 ? 2 + (id & 1) : id;
@ -1084,7 +1205,7 @@ void mapRareBiome(Layer *l, int * __restrict out, int areaX, int areaZ, int area
if(mcNextInt(l, 57) == 0 && v11 == plains)
{
// Flower Forest
// Sunflower Plains
out[x + z*areaWidth] = plains + 128;
}
else

3
layers.h
View File

@ -109,6 +109,7 @@ static inline int getTempCategory(int id)
return biomes[id & 0xff].tempCat;
}
static inline int equalOrPlateau(int id1, int id2)
{
if(id1 == id2) return 1;
@ -404,6 +405,8 @@ void mapRareBiome(Layer *l, int * __restrict out, int x, int z, int w, int h);
void mapShore(Layer *l, int * __restrict out, int x, int z, int w, int h);
void mapRiverMix(Layer *l, int * __restrict out, int x, int z, int w, int h);
// 1.13 layers
void mapHills113(Layer *l, int * __restrict out, int x, int z, int w, int h);
void mapOceanTemp(Layer *l, int * __restrict out, int areaX, int areaZ, int areaWidth, int areaHeight);
void mapOceanMix(Layer *l, int * __restrict out, int areaX, int areaZ, int areaWidth, int areaHeight);