* Add crying obsidian.

This commit is contained in:
iProgramInCpp
2023-08-13 22:01:28 +03:00
parent 2da5c2e2fe
commit f9130ba238
5 changed files with 79 additions and 29 deletions

View File

@@ -124,6 +124,7 @@ const char* GetGUIBlocksName();
// 9 chunks around a player things will tick
#define C_TICK_DISTANCE_CHKS (9)
// note: bunch of these are unimplemented.
enum eTileID
{
TILE_AIR,
@@ -149,11 +150,21 @@ enum eTileID
TILE_GLASS,
TILE_ORE_LAPIS,
TILE_BLOCK_LAPIS,
TILE_SANDSTONE = 24,
TILE_CLOTH = 35,
TILE_FLOWER = 37,
TILE_DISPENSER,
TILE_SANDSTONE,
TILE_NOTE_BLOCK,
TILE_BED,
TILE_RAIL_POWERED,
TYPE_RAIL_ACTIVATOR,
TILE_PISTON_STICKY,
TILE_COBWEB,
TILE_TALLGRASS,
TILE_DEAD_BUSH,
TILE_PISTON,
TILE_PISTON_HEAD,
TILE_CLOTH,
TILE_PISTON_MOVING,
TILE_FLOWER,
TILE_ROSE,
TILE_MUSHROOM_1,
TILE_MUSHROOM_2,
@@ -168,32 +179,55 @@ enum eTileID
TILE_OBSIDIAN,
TILE_TORCH,
TILE_FIRE,
TILE_STAIRS_WOOD = 53,
TILE_ORE_EMERALD = 56,
TILE_SPAWNER,
TILE_STAIRS_WOOD,
TILE_CHEST,
TILE_WIRE,
TILE_ORE_EMERALD,
TILE_BLOCK_EMERALD,
TILE_FARMLAND = 60,
TILE_DOOR_WOOD = 64,
TILE_WORKBENCH,
TILE_WHEAT,
TILE_FARMLAND,
TILE_FURNACE,
TILE_FURNACE_LIT,
TILE_SIGN,
TILE_DOOR_WOOD,
TILE_LADDER,
TILE_STAIRS_STONE = 67,
TILE_DOOR_IRON = 71,
TILE_ORE_REDSTONE = 73,
TILE_RAIL,
TILE_STAIRS_STONE,
TILE_SIGN_WALL,
TILE_LEVER,
TILE_PLATE_STONE,
TILE_DOOR_IRON,
TILE_PLATE_WOOD,
TILE_ORE_REDSTONE,
TILE_ORE_REDSTONE_LIT,
TILE_TOPSNOW = 78,
TILE_NOT_GATE_OFF,
TILE_NOT_GATE_ON,
TILE_BUTTON_STONE,
TILE_TOPSNOW,
TILE_ICE,
TILE_CLAY = 82,
TILE_SNOW,
TILE_CACTUS,
TILE_CLAY,
TILE_REEDS,
TILE_INVISIBLE = 95,
TILE_JUKEBOX,
TILE_FENCE,
TILE_PUMPKIN,
TILE_NETHERRACK,
TILE_SOUL_SAND,
TILE_GLOWSTONE,
TILE_PORTAL,
TILE_PUMPKIN_LIT,
TILE_CAKE,
TILE_REPEATER_OFF,
TILE_REPEATER_ON,
TILE_INVISIBLE = 95, // in JE, this is a locked chest
TILE_TRAPDOOR,
TILE_STONE_MONSTER_EGG,
TILE_STONE_BRICKS,
TILE_MUSHROOM1_BLOCK,
TILE_MUSHROOM2_BLOCK,
TILE_CLOTH_00 = 101,
TILE_CLOTH_10,
TILE_CLOTH_20,
@@ -210,6 +244,8 @@ enum eTileID
TILE_CLOTH_51,
TILE_CLOTH_61,
TILE_OBSIDIAN_CRYING = 200, // custom stuff - ID of 200
ITEM_SHOVEL_IRON = 256,
ITEM_PICKAXE_IRON,
ITEM_HATCHET_IRON,

View File

@@ -20,7 +20,7 @@
// actual name
const char* gSplashes[] =
{
"1 star! Deal with it notch!",
"One star! Deal with it notch!",
"100% more yellow text!",
"Glowing creepy eyes!",
"Toilet friendly!",

View File

@@ -65,9 +65,14 @@ void Inventory::prepareCreativeInventory()
addCreativeItem(Tile::lapisBlock->m_ID);
addCreativeItem(Tile::sponge->m_ID);
addCreativeItem(Tile::sapling->m_ID);
addCreativeItem(Tile::cryingObsidian->m_ID);
// test stuff
addCreativeItem(Tile::water->m_ID);
addCreativeItem(Tile::lava->m_ID);
addCreativeItem(Tile::fire->m_ID);
// items
addCreativeItem(Item::camera->m_itemID);
addCreativeItem(Item::door_wood->m_itemID);
addCreativeItem(Item::door_iron->m_itemID);

View File

@@ -678,6 +678,13 @@ void Tile::initTiles()
->setSoundType(Tile::SOUND_STONE)
->setDescriptionId("stoneMoss");
Tile::cryingObsidian = (new Tile(TILE_OBSIDIAN_CRYING, TEXTURE_OBSIDIAN_CRYING, Material::stone))
->init()
->setDestroyTime(10.0f)
->setExplodeable(2000.0f)
->setSoundType(Tile::SOUND_STONE)
->setDescriptionId("cryingObsidian");
for (int i = 0; i < C_MAX_TILES; i++)
{
if (Tile::tiles[i])
@@ -1105,4 +1112,5 @@ Tile
*Tile::sponge,
*Tile::lapisBlock,
*Tile::bookshelf,
*Tile::mossStone;
*Tile::mossStone,
*Tile::cryingObsidian;

View File

@@ -210,7 +210,8 @@ public: // static variables
* sponge,
* lapisBlock,
* bookshelf,
* mossStone;
* mossStone,
* cryingObsidian;
public:
int m_TextureFrame;