forked from oerkki/voxelands
borderstone, part 1
This commit is contained in:
darkrose
parent
0d9b59bddd
commit
101631d55f
Binary file not shown.
|
After Width: | Height: | Size: 933 B |
|
|
@ -334,6 +334,21 @@ InventoryItem *craft_get_result(InventoryItem **items)
|
|||
defs_init++;
|
||||
}
|
||||
|
||||
// Border Stone
|
||||
{
|
||||
defs[defs_init].specs[0] = ItemSpec(ITEM_MATERIAL, CONTENT_STONE);
|
||||
defs[defs_init].specs[1] = ItemSpec(ITEM_MATERIAL, CONTENT_STONE);
|
||||
defs[defs_init].specs[2] = ItemSpec(ITEM_MATERIAL, CONTENT_STONE);
|
||||
defs[defs_init].specs[3] = ItemSpec(ITEM_MATERIAL, CONTENT_STONE);
|
||||
defs[defs_init].specs[4] = ItemSpec(ITEM_MATERIAL, CONTENT_MESE);
|
||||
defs[defs_init].specs[5] = ItemSpec(ITEM_MATERIAL, CONTENT_STONE);
|
||||
defs[defs_init].specs[6] = ItemSpec(ITEM_MATERIAL, CONTENT_STONE);
|
||||
defs[defs_init].specs[7] = ItemSpec(ITEM_MATERIAL, CONTENT_STONE);
|
||||
defs[defs_init].specs[8] = ItemSpec(ITEM_MATERIAL, CONTENT_STONE);
|
||||
defs[defs_init].item = new MaterialItem(CONTENT_BORDERSTONE, 1);
|
||||
defs_init++;
|
||||
}
|
||||
|
||||
// Furnace
|
||||
{
|
||||
defs[defs_init].specs[0] = ItemSpec(ITEM_MATERIAL, CONTENT_COBBLE);
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ void setWoodLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
|
|||
Maps <=v19 content types to current ones.
|
||||
Should never be touched.
|
||||
*/
|
||||
content_t trans_table_19[20][2] = {
|
||||
content_t trans_table_19[21][2] = {
|
||||
{CONTENT_GRASS, 1},
|
||||
{CONTENT_TREE, 4},
|
||||
{CONTENT_LEAVES, 5},
|
||||
|
|
@ -50,6 +50,7 @@ content_t trans_table_19[20][2] = {
|
|||
{CONTENT_MESE, 7},
|
||||
{CONTENT_MUD, 8},
|
||||
{CONTENT_COTTON, 10},
|
||||
{CONTENT_BORDERSTONE, 11},
|
||||
{CONTENT_WOOD, 12},
|
||||
{CONTENT_SAND, 13},
|
||||
{CONTENT_COBBLE, 18},
|
||||
|
|
@ -340,6 +341,15 @@ void content_mapnode_init()
|
|||
f->climbable = true;
|
||||
setWoodLikeDiggingProperties(f->digging_properties, 0.5);
|
||||
|
||||
|
||||
i = CONTENT_BORDERSTONE;
|
||||
f = &content_features(i);
|
||||
f->setAllTextures("borderstone.png");
|
||||
f->setInventoryTextureCube("morderstone.png", "borderstone.png", "borderstone.png");
|
||||
f->is_ground_content = true;
|
||||
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
|
||||
setStoneLikeDiggingProperties(f->digging_properties, 2.0);
|
||||
|
||||
i = CONTENT_WOOD;
|
||||
f = &content_features(i);
|
||||
f->setAllTextures("wood.png");
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
void content_mapnode_init();
|
||||
|
||||
extern content_t trans_table_19[20][2];
|
||||
extern content_t trans_table_19[21][2];
|
||||
|
||||
MapNode mapnode_translate_from_internal(MapNode n_from, u8 version);
|
||||
MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
|
||||
|
|
@ -66,7 +66,7 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
|
|||
#define CONTENT_MUD 0x805 //8
|
||||
// used to be cloud
|
||||
#define CONTENT_COTTON 0x806 //10
|
||||
|
||||
#define CONTENT_BORDERSTONE 0x807 //11
|
||||
#define CONTENT_WOOD 0x808 //12
|
||||
#define CONTENT_SAND 0x809 //13
|
||||
#define CONTENT_COBBLE 0x80a //18
|
||||
|
|
|
|||
|
|
@ -906,7 +906,6 @@ void ServerEnvironment::step(float dtime)
|
|||
if(m_active_blocks_test_interval.step(dtime, 10.0))
|
||||
{
|
||||
ScopeProfiler sp(g_profiler, "SEnv: modify in blocks avg /10s", SPT_AVG);
|
||||
//float dtime = 10.0;
|
||||
|
||||
for(core::map<v3s16, bool>::Iterator
|
||||
i = m_active_blocks.m_list.getIterator();
|
||||
|
|
@ -914,9 +913,6 @@ void ServerEnvironment::step(float dtime)
|
|||
{
|
||||
v3s16 p = i.getNode()->getKey();
|
||||
|
||||
/*infostream<<"Server: Block ("<<p.X<<","<<p.Y<<","<<p.Z
|
||||
<<") being handled"<<std::endl;*/
|
||||
|
||||
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
|
||||
if(block==NULL)
|
||||
continue;
|
||||
|
|
@ -936,11 +932,6 @@ void ServerEnvironment::step(float dtime)
|
|||
Everything should bind to inside this single content
|
||||
searching loop to keep things fast.
|
||||
*/
|
||||
// TODO: Implement usage of ActiveBlockModifier
|
||||
|
||||
// Find out how many objects the block contains
|
||||
//u32 active_object_count = block->m_static_objects.m_active.size();
|
||||
// Find out how many objects this and all the neighbors contain
|
||||
u32 active_object_count_wider = 0;
|
||||
for(s16 x=-1; x<=1; x++)
|
||||
for(s16 y=-1; y<=1; y++)
|
||||
|
|
@ -952,16 +943,6 @@ void ServerEnvironment::step(float dtime)
|
|||
active_object_count_wider +=
|
||||
block->m_static_objects.m_active.size()
|
||||
+ block->m_static_objects.m_stored.size();
|
||||
|
||||
/*if(block->m_static_objects.m_stored.size() != 0){
|
||||
errorstream<<"ServerEnvironment::step(): "
|
||||
<<PP(block->getPos())<<" contains "
|
||||
<<block->m_static_objects.m_stored.size()
|
||||
<<" stored objects; "
|
||||
<<"when spawning objects, when counting active "
|
||||
<<"objects in wide area. relative position: "
|
||||
<<"("<<x<<","<<y<<","<<z<<")"<<std::endl;
|
||||
}*/
|
||||
}
|
||||
|
||||
v3s16 p0;
|
||||
|
|
@ -994,7 +975,7 @@ void ServerEnvironment::step(float dtime)
|
|||
*/
|
||||
if(n.getContent() == CONTENT_FARM_DIRT)
|
||||
{
|
||||
if (myrand()%30 == 0)
|
||||
if (myrand()%50 == 0)
|
||||
{
|
||||
s16 max_d = 1;
|
||||
s16 max_growth = 2;
|
||||
|
|
@ -1298,7 +1279,6 @@ void ServerEnvironment::step(float dtime)
|
|||
Apples should fall if there is no leaves block holding it
|
||||
*/
|
||||
if(n.getContent() == CONTENT_APPLE) {
|
||||
//actionstream << "checking apple at " << PP(p) << "\n";
|
||||
s16 max_d = 1;
|
||||
v3s16 apple_p = p, test_p;
|
||||
MapNode testnode;
|
||||
|
|
@ -1326,7 +1306,7 @@ void ServerEnvironment::step(float dtime)
|
|||
}
|
||||
/* grow junglegrass on sand near water */
|
||||
if(n.getContent() == CONTENT_SAND) {
|
||||
if(myrand()%1000 == 0)
|
||||
if(myrand()%5000 == 0)
|
||||
{
|
||||
MapNode n_top1 = m_map->getNodeNoEx(p+v3s16(0,1,0));
|
||||
MapNode n_top2 = m_map->getNodeNoEx(p+v3s16(0,2,0));
|
||||
|
|
@ -1456,60 +1436,6 @@ void ServerEnvironment::step(float dtime)
|
|||
*/
|
||||
removeRemovedObjects();
|
||||
}
|
||||
|
||||
if(g_settings->getBool("enable_experimental"))
|
||||
{
|
||||
|
||||
/*
|
||||
TEST CODE
|
||||
*/
|
||||
#if 0
|
||||
m_random_spawn_timer -= dtime;
|
||||
if(m_random_spawn_timer < 0)
|
||||
{
|
||||
//m_random_spawn_timer += myrand_range(2.0, 20.0);
|
||||
//m_random_spawn_timer += 2.0;
|
||||
m_random_spawn_timer += 200.0;
|
||||
|
||||
/*
|
||||
Find some position
|
||||
*/
|
||||
|
||||
/*v2s16 p2d(myrand_range(-5,5), myrand_range(-5,5));
|
||||
s16 y = 1 + getServerMap().findGroundLevel(p2d);
|
||||
v3f pos(p2d.X*BS,y*BS,p2d.Y*BS);*/
|
||||
|
||||
Player *player = getRandomConnectedPlayer();
|
||||
v3f pos(0,0,0);
|
||||
if(player)
|
||||
pos = player->getPosition();
|
||||
pos += v3f(
|
||||
myrand_range(-3,3)*BS,
|
||||
5,
|
||||
myrand_range(-3,3)*BS
|
||||
);
|
||||
|
||||
/*
|
||||
Create a ServerActiveObject
|
||||
*/
|
||||
|
||||
//TestSAO *obj = new TestSAO(this, 0, pos);
|
||||
//ServerActiveObject *obj = new ItemSAO(this, 0, pos, "CraftItem Stick 1");
|
||||
//ServerActiveObject *obj = new RatSAO(this, 0, pos);
|
||||
//ServerActiveObject *obj = new Oerkki1SAO(this, 0, pos);
|
||||
//ServerActiveObject *obj = new FireflySAO(this, 0, pos);
|
||||
|
||||
infostream<<"Server: Spawning MobV2SAO at "
|
||||
<<"("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"<<std::endl;
|
||||
|
||||
Settings properties;
|
||||
getMob_dungeon_master(properties);
|
||||
ServerActiveObject *obj = new MobV2SAO(this, 0, pos, &properties);
|
||||
addActiveObject(obj);
|
||||
}
|
||||
#endif
|
||||
|
||||
} // enable_experimental
|
||||
}
|
||||
|
||||
ServerActiveObject* ServerEnvironment::getActiveObject(u16 id)
|
||||
|
|
|
|||
Loading…
Reference in New Issue