commit
814e4404bb
@ -17,15 +17,25 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
|
||||||
{
|
|
||||||
// Don't drop anything
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
|
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
|
||||||
{
|
{
|
||||||
return (a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) == E_BLOCK_SAND);
|
if (a_RelY <= 0)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
BLOCKTYPE BelowBlock = a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ);
|
||||||
|
switch (BelowBlock)
|
||||||
|
{
|
||||||
|
case E_BLOCK_CLAY:
|
||||||
|
case E_BLOCK_HARDENED_CLAY:
|
||||||
|
case E_BLOCK_STAINED_CLAY:
|
||||||
|
case E_BLOCK_SAND:
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
default: return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "BlockHandler.h"
|
#include "BlockHandler.h"
|
||||||
|
#include "ChunkInterface.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -10,6 +11,7 @@
|
|||||||
class cBlockTallGrassHandler :
|
class cBlockTallGrassHandler :
|
||||||
public cBlockHandler
|
public cBlockHandler
|
||||||
{
|
{
|
||||||
|
typedef cBlockHandler super;
|
||||||
public:
|
public:
|
||||||
cBlockTallGrassHandler(BLOCKTYPE a_BlockType)
|
cBlockTallGrassHandler(BLOCKTYPE a_BlockType)
|
||||||
: cBlockHandler(a_BlockType)
|
: cBlockHandler(a_BlockType)
|
||||||
@ -26,32 +28,58 @@ public:
|
|||||||
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
|
||||||
{
|
{
|
||||||
// Drop seeds, sometimes
|
// Drop seeds, sometimes
|
||||||
MTRand r1;
|
cFastRandom Random;
|
||||||
if (r1.randInt(10) == 5)
|
if (Random.NextInt(8) == 0)
|
||||||
{
|
{
|
||||||
a_Pickups.push_back(cItem(E_ITEM_SEEDS, 1, 0));
|
a_Pickups.push_back(cItem(E_ITEM_SEEDS, 1, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
|
virtual void DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_BlockPluginInterface, cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, bool a_CanDrop) override
|
||||||
|
{
|
||||||
|
if (a_CanDrop && (a_Digger != NULL) && (a_Digger->GetEquippedWeapon().m_ItemType == E_ITEM_SHEARS))
|
||||||
{
|
{
|
||||||
NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
|
NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
|
||||||
|
cItems Drops;
|
||||||
|
Drops.Add(m_BlockType, 1, Meta);
|
||||||
|
|
||||||
if ((!a_Player->IsGameModeCreative()) && (a_Player->GetEquippedItem().m_ItemType == E_ITEM_SHEARS))
|
// Allow plugins to modify the pickups:
|
||||||
|
a_BlockPluginInterface.CallHookBlockToPickups(a_Digger, a_BlockX, a_BlockY, a_BlockZ, m_BlockType, Meta, Drops);
|
||||||
|
|
||||||
|
// Spawn the pickups:
|
||||||
|
if (!Drops.empty())
|
||||||
{
|
{
|
||||||
cItems Pickups;
|
MTRand r1;
|
||||||
Pickups.Add(E_BLOCK_TALL_GRASS, 1, Meta);
|
|
||||||
a_WorldInterface.SpawnItemPickups(Pickups, a_BlockX, a_BlockY, a_BlockZ);
|
|
||||||
|
|
||||||
a_Player->UseEquippedItem();
|
// Mid-block position first
|
||||||
|
double MicroX, MicroY, MicroZ;
|
||||||
|
MicroX = a_BlockX + 0.5;
|
||||||
|
MicroY = a_BlockY + 0.5;
|
||||||
|
MicroZ = a_BlockZ + 0.5;
|
||||||
|
|
||||||
|
// Add random offset second
|
||||||
|
MicroX += r1.rand(1) - 0.5;
|
||||||
|
MicroZ += r1.rand(1) - 0.5;
|
||||||
|
|
||||||
|
a_WorldInterface.SpawnItemPickups(Drops, MicroX, MicroY, MicroZ);
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
super::DropBlock(a_ChunkInterface, a_WorldInterface, a_BlockPluginInterface, a_Digger, a_BlockX, a_BlockY, a_BlockZ, a_CanDrop);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
|
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
|
||||||
{
|
{
|
||||||
return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR));
|
if (a_RelY <= 0)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
BLOCKTYPE BelowBlock = a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ);
|
||||||
|
return IsBlockTypeOfDirt(BelowBlock);
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
@ -23,10 +23,6 @@ public:
|
|||||||
BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
|
BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
|
||||||
) override
|
) override
|
||||||
{
|
{
|
||||||
UNUSED(a_Player);
|
|
||||||
UNUSED(a_CursorX);
|
|
||||||
UNUSED(a_CursorY);
|
|
||||||
UNUSED(a_CursorZ);
|
|
||||||
// TODO: Disallow placement where the vine doesn't attach to something properly
|
// TODO: Disallow placement where the vine doesn't attach to something properly
|
||||||
BLOCKTYPE BlockType = 0;
|
BLOCKTYPE BlockType = 0;
|
||||||
NIBBLETYPE BlockMeta;
|
NIBBLETYPE BlockMeta;
|
||||||
@ -80,7 +76,21 @@ public:
|
|||||||
/// Returns true if the specified block type is good for vines to attach to
|
/// Returns true if the specified block type is good for vines to attach to
|
||||||
static bool IsBlockAttachable(BLOCKTYPE a_BlockType)
|
static bool IsBlockAttachable(BLOCKTYPE a_BlockType)
|
||||||
{
|
{
|
||||||
return ((a_BlockType == E_BLOCK_LEAVES) || (a_BlockType == E_BLOCK_NEW_LEAVES) || cBlockInfo::IsSolid(a_BlockType));
|
switch (a_BlockType)
|
||||||
|
{
|
||||||
|
case E_BLOCK_GLASS:
|
||||||
|
case E_BLOCK_STAINED_GLASS:
|
||||||
|
case E_BLOCK_CHEST:
|
||||||
|
case E_BLOCK_TRAPPED_CHEST:
|
||||||
|
{
|
||||||
|
// You can't attach a vine to this solid blocks.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
{
|
||||||
|
return cBlockInfo::IsSolid(a_BlockType);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -572,6 +572,8 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
|
|||||||
case E_BLOCK_COBBLESTONE:
|
case E_BLOCK_COBBLESTONE:
|
||||||
case E_BLOCK_COBBLESTONE_STAIRS:
|
case E_BLOCK_COBBLESTONE_STAIRS:
|
||||||
case E_BLOCK_COBBLESTONE_WALL:
|
case E_BLOCK_COBBLESTONE_WALL:
|
||||||
|
case E_BLOCK_COBWEB:
|
||||||
|
case E_BLOCK_DEAD_BUSH:
|
||||||
case E_BLOCK_DIAMOND_BLOCK:
|
case E_BLOCK_DIAMOND_BLOCK:
|
||||||
case E_BLOCK_DIAMOND_ORE:
|
case E_BLOCK_DIAMOND_ORE:
|
||||||
case E_BLOCK_DOUBLE_NEW_STONE_SLAB:
|
case E_BLOCK_DOUBLE_NEW_STONE_SLAB:
|
||||||
|
@ -28,21 +28,25 @@ public:
|
|||||||
|
|
||||||
virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
|
virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
|
||||||
{
|
{
|
||||||
BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
|
BLOCKTYPE Block;
|
||||||
|
NIBBLETYPE BlockMeta;
|
||||||
|
a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, BlockMeta);
|
||||||
|
|
||||||
if ((Block == E_BLOCK_LEAVES) || (Block == E_BLOCK_NEW_LEAVES))
|
if ((Block == E_BLOCK_LEAVES) || (Block == E_BLOCK_NEW_LEAVES))
|
||||||
{
|
{
|
||||||
NIBBLETYPE Meta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
|
cItems Drops;
|
||||||
cBlockHandler * Handler = cBlockInfo::GetHandler(Block);
|
cBlockHandler * Handler = cBlockInfo::GetHandler(Block);
|
||||||
|
|
||||||
cItems Drops;
|
Handler->ConvertToPickups(Drops, BlockMeta);
|
||||||
Handler->ConvertToPickups(Drops, Meta);
|
Drops.Add(Block, 1, BlockMeta & 3);
|
||||||
Drops.push_back(cItem(Block, 1, Meta & 3));
|
|
||||||
a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
|
a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
|
||||||
|
|
||||||
a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
|
a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
|
||||||
|
a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
|
||||||
a_Player->UseEquippedItem();
|
a_Player->UseEquippedItem();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,12 +57,10 @@ public:
|
|||||||
{
|
{
|
||||||
case E_BLOCK_COBWEB:
|
case E_BLOCK_COBWEB:
|
||||||
case E_BLOCK_VINES:
|
case E_BLOCK_VINES:
|
||||||
case E_BLOCK_LEAVES:
|
|
||||||
case E_BLOCK_NEW_LEAVES:
|
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} // switch (a_BlockType)
|
}
|
||||||
return super::CanHarvestBlock(a_BlockType);
|
return super::CanHarvestBlock(a_BlockType);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,14 +73,23 @@ public:
|
|||||||
|
|
||||||
virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ) override
|
virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ) override
|
||||||
{
|
{
|
||||||
super::OnBlockDestroyed(a_World, a_Player, a_Item, a_BlockX, a_BlockY, a_BlockZ);
|
BLOCKTYPE Block;
|
||||||
|
NIBBLETYPE BlockMeta;
|
||||||
|
a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, BlockMeta);
|
||||||
|
|
||||||
BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
|
super::OnBlockDestroyed(a_World, a_Player, a_Item, a_BlockX, a_BlockY, a_BlockZ);
|
||||||
if ((Block == E_BLOCK_TRIPWIRE) || (Block == E_BLOCK_VINES))
|
switch (Block)
|
||||||
|
{
|
||||||
|
case E_BLOCK_COBWEB:
|
||||||
|
case E_BLOCK_DEAD_BUSH:
|
||||||
|
case E_BLOCK_TRIPWIRE:
|
||||||
|
case E_BLOCK_VINES:
|
||||||
|
case E_BLOCK_WOOL:
|
||||||
{
|
{
|
||||||
a_Player->UseEquippedItem();
|
a_Player->UseEquippedItem();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user