Skip to content
Permalink
Browse files

Simple decorations: Add 'param2_max' parameter for random param2

If 'param2_max' is not used, parameter 'param2' works as before for
compatibility.
If 'param2_max' is used, 'param2' and 'param2_max' become the lower
and upper bounds of a per-decoration random param2.
  • Loading branch information...
paramat committed Oct 8, 2017
1 parent 1701609 commit 0c9ca27ffce7d53ede74bd6ccbf590d1cbe94b7b
Showing with 17 additions and 3 deletions.
  1. +4 −0 doc/lua_api.txt
  2. +4 −1 src/mg_decoration.cpp
  3. +1 −0 src/mg_decoration.h
  4. +8 −2 src/script/lua_api/l_mapgen.cpp
@@ -4842,6 +4842,10 @@ Definition tables
-- ^ If absent, the parameter 'height' is used as a constant.
param2 = 0,
-- ^ Param2 value of placed decoration node.
-- ^ If param2_max is not 0, this is the lower bound of the randomly selected param2.
param2_max = 0,
-- ^ Upper bound of the randomly selected param2.
-- ^ If absent, the parameter 'param2' is used as a constant.

----- Schematic-type parameters
schematic = "foobar.mts",
@@ -227,6 +227,9 @@ size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
s16 height = (deco_height_max > 0) ?
pr->range(deco_height, deco_height_max) : deco_height;

u8 param2 = (deco_param2_max > 0) ?
pr->range(deco_param2, deco_param2_max) : deco_param2;

bool force_placement = (flags & DECO_FORCE_PLACEMENT);

const v3s16 &em = vm->m_area.getExtent();
@@ -239,7 +242,7 @@ size_t DecoSimple::generate(MMVManip *vm, PcgRandom *pr, v3s16 p)
!force_placement)
break;

vm->m_data[vi] = MapNode(c_place, 0, deco_param2);
vm->m_data[vi] = MapNode(c_place, 0, param2);
}

return 1;
@@ -84,6 +84,7 @@ class DecoSimple : public Decoration {
s16 deco_height;
s16 deco_height_max;
u8 deco_param2;
u8 deco_param2_max;
};


@@ -981,6 +981,7 @@ bool read_deco_simple(lua_State *L, DecoSimple *deco)
{
int index = 1;
int param2;
int param2_max;

deco->deco_height = getintfield_default(L, index, "height", 1);
deco->deco_height_max = getintfield_default(L, index, "height_max", 0);
@@ -993,19 +994,24 @@ bool read_deco_simple(lua_State *L, DecoSimple *deco)

size_t nnames = getstringlistfield(L, index, "decoration", &deco->m_nodenames);
deco->m_nnlistsizes.push_back(nnames);

if (nnames == 0) {
errorstream << "register_decoration: no decoration nodes "
"defined" << std::endl;
return false;
}

param2 = getintfield_default(L, index, "param2", 0);
if ((param2 < 0) || (param2 > 255)) {
errorstream << "register_decoration: param2 out of bounds (0-255)"
param2_max = getintfield_default(L, index, "param2_max", 0);

if (param2 < 0 || param2 > 255 || param2_max < 0 || param2_max > 255) {
errorstream << "register_decoration: param2 or param2_max out of bounds (0-255)"
<< std::endl;
return false;
}

deco->deco_param2 = (u8)param2;
deco->deco_param2_max = (u8)param2_max;

return true;
}

0 comments on commit 0c9ca27

Please sign in to comment.
You can’t perform that action at this time.