Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add granite bricks #229

Merged
merged 1 commit into from
Oct 28, 2021
Merged

Add granite bricks #229

merged 1 commit into from
Oct 28, 2021

Conversation

BuckarooBanzay
Copy link
Member

This adds granite bricks from sfence (original PR here: minetest-mods/technic#593)

@sfence i took the liberty and copied your code and textures, if thats alright with you (i like the addition 😄)

screenshot_20211027_132625

@BuckarooBanzay BuckarooBanzay added the Enhancement New feature or request label Oct 27, 2021
@github-actions
Copy link

Click for detailed source code test coverage report

Test coverage report for Technic CNC 79.48% in 8/8 files:

File                             Hits Missed Coverage
-----------------------------------------------------
programs.lua  263  0      100.00%
cnc.lua       50   3      94.34%
formspec.lua  103  8      92.79%
digilines.lua 39   8      82.98%
init.lua      19   6      76.00%
api.lua       160  83     65.84%
pipeworks.lua 25   13     65.79%
materials.lua 174  94     64.93%

Test coverage report for technic 9.61% in 10/103 files:

File                                      Hits Missed Coverage
--------------------------------------------------------------
machines/HV/generator.lua                 9    0      100.00%
config.lua                                47   4      92.16%
machines/register/cables.lua              168  49     77.42%
machines/network.lua                      192  162    54.24%
machines/supply_converter.lua             75   66     53.19%
register.lua                              20   20     50.00%
machines/MV/cables.lua                    10   11     47.62%
machines/LV/cables.lua                    10   11     47.62%
machines/HV/cables.lua                    9    11     45.00%
machines/register/generator.lua           91   114    44.39%
util/throttle.lua                         0    11     0.00%
tools/vacuum.lua                          0    32     0.00%
tools/tree_tap.lua                        0    38     0.00%
tools/sonic_screwdriver.lua               0    51     0.00%
tools/prospector.lua                      0    101    0.00%
tools/multimeter.lua                      0    208    0.00%
tools/mining_lasers.lua                   0    65     0.00%
tools/mining_drill.lua                    0    268    0.00%
tools/init.lua                            0    14     0.00%
tools/flashlight.lua                      0    68     0.00%
tools/chainsaw.lua                        0    115    0.00%
tools/cans.lua                            0    71     0.00%
radiation.lua                             0    138    0.00%
max_lag.lua                               0    12     0.00%
machines/switching_station_globalstep.lua 0    58     0.00%
machines/switching_station.lua            0    79     0.00%
machines/register/solar_array.lua         0    30     0.00%
machines/register/recipes.lua             0    78     0.00%
machines/register/machine_base.lua        0    166    0.00%
machines/register/init.lua                0    22     0.00%
machines/register/grindings.lua           0    39     0.00%
machines/register/grinder_recipes.lua     0    100    0.00%
machines/register/grinder.lua             0    6      0.00%
machines/register/freezer_recipes.lua     0    12     0.00%
machines/register/freezer.lua             0    6      0.00%
machines/register/extractor_recipes.lua   0    71     0.00%
machines/register/extractor.lua           0    6      0.00%
machines/register/electric_furnace.lua    0    6      0.00%
machines/register/compressor_recipes.lua  0    33     0.00%
machines/register/compressor.lua          0    6      0.00%
machines/register/common.lua              0    114    0.00%
machines/register/centrifuge_recipes.lua  0    25     0.00%
machines/register/centrifuge.lua          0    6      0.00%
machines/register/battery_box.lua         0    238    0.00%
machines/register/alloy_recipes.lua       0    40     0.00%
machines/register/alloy_furnace.lua       0    30     0.00%
machines/power_monitor.lua                0    57     0.00%
machines/other/injector.lua               0    85     0.00%
machines/other/init.lua                   0    8      0.00%
machines/other/frames.lua                 0    551    0.00%
machines/other/constructor.lua            0    103    0.00%
machines/other/coal_furnace.lua           0    3      0.00%
machines/other/coal_alloy_furnace.lua     0    94     0.00%
machines/other/anchor.lua                 0    79     0.00%
machines/init.lua                         0    85     0.00%
machines/compat/digtron.lua               0    13     0.00%
machines/MV/wind_mill.lua                 0    45     0.00%
machines/MV/tool_workshop.lua             0    73     0.00%
machines/MV/solar_array.lua               0    7      0.00%
machines/MV/power_radiator.lua            0    96     0.00%
machines/MV/lighting.lua                  0    170    0.00%
machines/MV/init.lua                      0    17     0.00%
machines/MV/hydro_turbine.lua             0    44     0.00%
machines/MV/grinder.lua                   0    6      0.00%
machines/MV/generator.lua                 0    7      0.00%
machines/MV/freezer.lua                   0    6      0.00%
machines/MV/extractor.lua                 0    6      0.00%
machines/MV/electric_furnace.lua          0    6      0.00%
machines/MV/compressor.lua                0    6      0.00%
machines/MV/centrifuge.lua                0    6      0.00%
machines/MV/battery_box.lua               0    6      0.00%
machines/MV/alloy_furnace.lua             0    6      0.00%
machines/LV/water_mill.lua                0    47     0.00%
machines/LV/solar_panel.lua               0    27     0.00%
machines/LV/solar_array.lua               0    6      0.00%
machines/LV/music_player.lua              0    81     0.00%
machines/LV/led.lua                       0    38     0.00%
machines/LV/lamp.lua                      0    68     0.00%
machines/LV/init.lua                      0    17     0.00%
machines/LV/grinder.lua                   0    7      0.00%
machines/LV/geothermal.lua                0    56     0.00%
machines/LV/generator.lua                 0    7      0.00%
machines/LV/extractor.lua                 0    13     0.00%
machines/LV/electric_furnace.lua          0    6      0.00%
machines/LV/compressor.lua                0    10     0.00%
machines/LV/battery_box.lua               0    6      0.00%
machines/LV/alloy_furnace.lua             0    6      0.00%
machines/HV/solar_array.lua               0    6      0.00%
machines/HV/quarry.lua                    0    306    0.00%
machines/HV/nuclear_reactor.lua           0    266    0.00%
machines/HV/init.lua                      0    12     0.00%
machines/HV/grinder.lua                   0    6      0.00%
machines/HV/forcefield.lua                0    213    0.00%
machines/HV/electric_furnace.lua          0    6      0.00%
machines/HV/compressor.lua                0    6      0.00%
machines/HV/battery_box.lua               0    6      0.00%
legacy.lua                                0    7      0.00%
items.lua                                 0    51     0.00%
integration_test.lua                      0    24     0.00%
init.lua                                  0    30     0.00%
helpers.lua                               0    116    0.00%
effects.lua                               0    3      0.00%
crafts.lua                                0    86     0.00%

Raw test runner output for geeks:

CNC:

●●●●●●●●●●●●●●●●●●●●●●
22 successes / 0 failures / 0 errors / 0 pending : 0.207001 seconds

Technic:

●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●●◌●●●●●
57 successes / 0 failures / 0 errors / 1 pending : 0.169369 seconds

Pending → spec/supply_converter_spec.lua @ 99
Supply converter building overloads network
spec/supply_converter_spec.lua:99: overload does not work with supply converter

@S-S-X
Copy link
Member

S-S-X commented Oct 27, 2021

Should is_ground_content be false instead of true for bricks and blocks?
Does not have to be changed here even if it should be but is it clear that it should have is_ground_content = true or should there be discussion issue to decide how it should be?

@BuckarooBanzay
Copy link
Member Author

Should is_ground_content be false instead of true for bricks and blocks? Does not have to be changed here even if it should be but is it clear that it should have is_ground_content = true or should there be discussion issue to decide how it should be?

From the lua api docs:

        is_ground_content = true,
        -- If false, the cave generator and dungeon generator will not carve
        -- through this node.
        -- Specifically, this stops mod-added nodes being removed by caves and
        -- dungeons when those generate in a neighbor mapchunk and extend out
        -- beyond the edge of that mapchunk.

This should not really matter IMO and the field removed entirely, the bricks are artificially crafted/placed and should not end up somewhere in mapgen anyway

@S-S-X
Copy link
Member

S-S-X commented Oct 27, 2021

This should not really matter IMO and the field removed entirely, the bricks are artificially crafted/placed and should not end up somewhere in mapgen anyway

Yeah, maybe I was thinking bit too much ahead probably as I was actually thinking about mapgen buildings (for mods discussed around pandorabox ideas repo).

@OgelGames
Copy link
Contributor

OgelGames commented Oct 27, 2021

Should is_ground_content be false instead of true for bricks and blocks?

I would say yes, that would be better, but that can be left for a different PR, as other nodes should have that changed too.

@OgelGames OgelGames changed the title add granite bricks Add granite bricks Oct 27, 2021
@S-S-X
Copy link
Member

S-S-X commented Oct 28, 2021

Tested, seems nice and good.

Texture could be updated to make edges nicer, seems to be just default stone brick texture over granite node.

I bet someone will notice that in game too, probably stone brick can be used just fine but with some better filter to make it similar to other dark bricks instead of following edges of light bricks.

@S-S-X S-S-X merged commit 10a80b9 into master Oct 28, 2021
@OgelGames OgelGames deleted the granite-bricks branch October 28, 2021 09:54
@sfence
Copy link
Contributor

sfence commented Oct 28, 2021

I am ok with it.
This is the open-source world. :)

@Athozus Athozus added this to the 2.0.0 milestone Apr 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants