diff --git a/doc/en/block-properties.md b/doc/en/block-properties.md index 65ff4c75d..25c19ba6f 100644 --- a/doc/en/block-properties.md +++ b/doc/en/block-properties.md @@ -372,11 +372,17 @@ To generate loot, the function `block_loot(block_id: int)` in the `base:util` mo ## Other properties +### *abstract* + +An abstract block is used as a basis for defining blocks of the same type through inheritance (the `parent` property) (example: stairs). +As in the case of `hidden=true`, the item for the block is not generated. +Unlike `hidden`, the property is not inherited. + ### *script-name* Used to specify block script name (to reuse one script to multiple blocks). Name must not contain `packid:scripts/` and extension. Just name. -### Tick Interval - *tick-interval* +### *tick-interval* The interval in ticks (1/20th of a second). A value of 20 results in an on_block_tick call interval of one second. diff --git a/doc/ru/block-properties.md b/doc/ru/block-properties.md index 8a64feb7a..fd0ee3ec2 100644 --- a/doc/ru/block-properties.md +++ b/doc/ru/block-properties.md @@ -372,6 +372,11 @@ ## Другое +### Абстрактный блок - *abstract* + +Абстрактный блок используется исключительно как основа для определений однотипных блоков через наследование (свойство `parent`) (пример: ступеньки). Как в случае `hidden=true` предмет для блока не генерируется. +В отличие от `hidden` свойство не наследуется. + ### Имя скрипта - *script-name* Позволяет указать название скрипта блока. Свойство обеспечивает возможность использования одного скрипта для нескольких блоков. diff --git a/src/content/ContentBuilder.cpp b/src/content/ContentBuilder.cpp index 4c478f4ef..1484e6e70 100644 --- a/src/content/ContentBuilder.cpp +++ b/src/content/ContentBuilder.cpp @@ -133,7 +133,7 @@ std::unique_ptr ContentBuilder::build() { content->items .require( def->pickingItem.empty() - ? (def->hidden ? CORE_EMPTY + ? ((def->abstract || def->hidden) ? CORE_EMPTY : def->name + BLOCK_ITEM_SUFFIX) : def->pickingItem ) diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index bf752531d..9ab0a379e 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -288,7 +288,7 @@ void ContentLoader::loadContent(const dv::value& root) { ContentUnitLoader(*pack, builder.blocks, "blocks", [this](const Block& def) { - if (!def.hidden) { + if (!def.abstract || !def.hidden) { bool created; auto& item = builder.items.create( def.name + BLOCK_ITEM_SUFFIX, &created diff --git a/src/content/loading/BlockLoader.cpp b/src/content/loading/BlockLoader.cpp index 1c1a1345c..85b35b348 100644 --- a/src/content/loading/BlockLoader.cpp +++ b/src/content/loading/BlockLoader.cpp @@ -260,6 +260,7 @@ template<> void ContentUnitLoader::loadUnit( root.at("selectable").get(def.selectable); root.at("grounded").get(def.grounded); root.at("hidden").get(def.hidden); + root.at("abstract").get(def.abstract); root.at("picking-item").get(def.pickingItem); root.at("surface-replacement").get(def.surfaceReplacement); root.at("script-name").get(def.scriptName); diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp index 27029f43c..732839199 100644 --- a/src/voxels/Block.hpp +++ b/src/voxels/Block.hpp @@ -258,6 +258,9 @@ public: /// below bool grounded = false; + /// @brief Makes block abstract + bool abstract = false; + /// @brief Turns off block item generation bool hidden = false;