Skip to content

Commit 8270954

Browse files
minetest-servicesminetest-services
committedApr 3, 2013
Merge remote branch 'origin/master'
·
5.11.00.4.6
2 parents 6e96bc9 + 9ff8012 commit 8270954

File tree

7 files changed

+74
-11
lines changed

7 files changed

+74
-11
lines changed
 

‎builtin/item.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ function minetest.item_place(itemstack, placer, pointed_thing)
244244
local n = minetest.env:get_node(pointed_thing.under)
245245
local nn = n.name
246246
if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
247-
return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack)
247+
return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack) or itemstack
248248
end
249249
end
250250

‎doc/lua_api.txt

+9
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,13 @@ All default ores are of the uniformly-distributed scatter type.
394394
Places ore if there are no more than clust_scarcity number of specified nodes within a Von Neumann
395395
neighborhood of clust_size radius.
396396

397+
Ore attributes
398+
-------------------
399+
Currently supported flags: absheight
400+
- absheight
401+
Also produce this same ore between the height range of -height_max and -height_min.
402+
Useful for having ore in sky realms without having to duplicate ore entries.
403+
397404
Representations of simple things
398405
--------------------------------
399406
Position/vector:
@@ -1723,6 +1730,8 @@ Ore definition (register_ore)
17231730
^ In this example, there is a 3x3x3 cluster where 8 out of the 27 nodes are coal ore
17241731
height_min = -31000,
17251732
height_max = 64,
1733+
flags = "",
1734+
^ Attributes for this ore generation
17261735
noise_threshhold = 0.5,
17271736
^ If noise is above this threshhold, ore is placed. Not needed for a uniform distribution
17281737
noise_params = {offset=0, scale=1, spread={x=100, y=100, z=100}, seed=23, octaves=3, persist=0.70}

‎src/mapgen.cpp

+39-9
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,14 @@ FlagDesc flagdesc_mapgen[] = {
4242
{"v6_jungles", MGV6_JUNGLES},
4343
{"v6_biome_blend", MGV6_BIOME_BLEND},
4444
{"flat", MG_FLAT},
45-
{NULL, 0}
45+
{NULL, 0}
46+
};
47+
48+
FlagDesc flagdesc_ore[] = {
49+
{"absheight", OREFLAG_ABSHEIGHT},
50+
{"scatter_noisedensity", OREFLAG_DENSITY},
51+
{"claylike_nodeisnt", OREFLAG_NODEISNT},
52+
{NULL, 0}
4653
};
4754

4855

@@ -87,17 +94,28 @@ void Ore::resolveNodeNames(INodeDefManager *ndef) {
8794

8895

8996
void OreScatter::generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
90-
if (nmin.Y > height_max || nmax.Y < height_min)
97+
int in_range = 0;
98+
99+
in_range |= (nmin.Y <= height_max && nmax.Y >= height_min);
100+
if (flags & OREFLAG_ABSHEIGHT)
101+
in_range |= (nmin.Y >= -height_max && nmax.Y <= -height_min) << 1;
102+
if (!in_range)
91103
return;
92-
104+
93105
resolveNodeNames(mg->ndef);
94106

95107
MapNode n_ore(ore);
96108
ManualMapVoxelManipulator *vm = mg->vm;
97109
PseudoRandom pr(blockseed);
110+
int ymin, ymax;
98111

99-
int ymin = MYMAX(nmin.Y, height_min);
100-
int ymax = MYMIN(nmax.Y, height_max);
112+
if (in_range & ORE_RANGE_MIRROR) {
113+
ymin = MYMAX(nmin.Y, -height_max);
114+
ymax = MYMIN(nmax.Y, -height_min);
115+
} else {
116+
ymin = MYMAX(nmin.Y, height_min);
117+
ymax = MYMIN(nmax.Y, height_max);
118+
}
101119
if (clust_size >= ymax - ymin + 1)
102120
return;
103121

@@ -131,17 +149,29 @@ void OreScatter::generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
131149

132150

133151
void OreSheet::generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
134-
if (nmin.Y > height_max || nmax.Y < height_min)
135-
return;
152+
int in_range = 0;
136153

154+
in_range |= (nmin.Y <= height_max && nmax.Y >= height_min);
155+
if (flags & OREFLAG_ABSHEIGHT)
156+
in_range |= (nmin.Y >= -height_max && nmax.Y <= -height_min) << 1;
157+
if (!in_range)
158+
return;
159+
137160
resolveNodeNames(mg->ndef);
138161

139162
MapNode n_ore(ore);
140163
ManualMapVoxelManipulator *vm = mg->vm;
141164
PseudoRandom pr(blockseed + 4234);
165+
int ymin, ymax;
142166

143-
int ymin = MYMAX(nmin.Y, height_min);
144-
int ymax = MYMIN(nmax.Y, height_max);
167+
if (in_range & ORE_RANGE_MIRROR) {
168+
ymin = MYMAX(nmin.Y, -height_max);
169+
ymax = MYMIN(nmax.Y, -height_min);
170+
} else {
171+
ymin = MYMAX(nmin.Y, height_min);
172+
ymax = MYMIN(nmax.Y, height_max);
173+
}
174+
145175
if (clust_size >= ymax - ymin + 1)
146176
return;
147177

‎src/mapgen.h

+15-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
3636
#define MGV6_BIOME_BLEND 0x10
3737
#define MG_FLAT 0x20
3838

39+
/////////////////// Ore generation flags
40+
// Use absolute value of height to determine ore placement
41+
#define OREFLAG_ABSHEIGHT 0x01
42+
// Use 3d noise to get density of ore placement, instead of just the position
43+
#define OREFLAG_DENSITY 0x02 // not yet implemented
44+
// For claylike ore types, place ore if the number of surrounding
45+
// nodes isn't the specified node
46+
#define OREFLAG_NODEISNT 0x04 // not yet implemented
47+
3948
extern FlagDesc flagdesc_mapgen[];
49+
extern FlagDesc flagdesc_ore[];
4050

4151
class BiomeDefManager;
4252
class Biome;
@@ -103,18 +113,22 @@ enum OreType {
103113
ORE_CLAYLIKE
104114
};
105115

116+
#define ORE_RANGE_ACTUAL 1
117+
#define ORE_RANGE_MIRROR 2
118+
106119
class Ore {
107120
public:
108121
std::string ore_name;
109122
std::string wherein_name;
110123

111124
content_t ore;
112125
content_t wherein; // the node to be replaced
113-
s16 clust_scarcity; //
126+
u32 clust_scarcity; // ore cluster has a 1-in-clust_scarcity chance of appearing at a node
114127
s16 clust_num_ores; // how many ore nodes are in a chunk
115128
s16 clust_size; // how large (in nodes) a chunk of ore is
116129
s16 height_min;
117130
s16 height_max;
131+
u32 flags; // attributes for this ore
118132
float nthresh; // threshhold for noise at which an ore is placed
119133
NoiseParams *np; // noise for distribution of clusters (NULL for uniform scattering)
120134
Noise *noise;

‎src/scriptapi.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,7 @@ static int l_register_ore(lua_State *L)
717717
ore->clust_size = getintfield_default(L, index, "clust_size", 0);
718718
ore->height_min = getintfield_default(L, index, "height_min", 0);
719719
ore->height_max = getintfield_default(L, index, "height_max", 0);
720+
ore->flags = getflagsfield(L, index, "flags", flagdesc_ore);
720721
ore->nthresh = getfloatfield_default(L, index, "noise_threshhold", 0.);
721722

722723
lua_getfield(L, index, "noise_params");

‎src/scriptapi_types.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,13 @@ void setboolfield(lua_State *L, int table,
336336
lua_setfield(L, table, fieldname);
337337
}
338338

339+
u32 getflagsfield(lua_State *L, int table,
340+
const char *fieldname, FlagDesc *flagdesc) {
341+
std::string flagstring;
342+
343+
flagstring = getstringfield_default(L, table, fieldname, "");
344+
return readFlagString(flagstring, flagdesc);
345+
}
339346

340347
/* minetest specific types */
341348
MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)

‎src/scriptapi_types.h

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ bool getboolfield(lua_State *L, int table,
5151
const char *fieldname, bool &result);
5252
bool getfloatfield(lua_State *L, int table,
5353
const char *fieldname, float &result);
54+
u32 getflagsfield(lua_State *L, int table,
55+
const char *fieldname, FlagDesc *flagdesc);
5456

5557
std::string checkstringfield(lua_State *L, int table,
5658
const char *fieldname);

0 commit comments

Comments
 (0)
Please sign in to comment.