diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 160a529ee..002abc92e 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -49,7 +49,7 @@ function register_tool(name, material, mining_speed, harvest_capability) elseif name == "shovel" then tool_def.effective_on = { "group:om_material_dirt", - "group:om_material:sand" + "group:om_material_sand" } tool_def.on_item_activated = function(pos, block, player, world, client, server) diff --git a/resources/shaders/game.v.glsl b/resources/shaders/game.v.glsl index 5f3fe4ccc..09d89bcfd 100644 --- a/resources/shaders/game.v.glsl +++ b/resources/shaders/game.v.glsl @@ -49,7 +49,7 @@ void main() { v_lightValue = lightValue; if (ambientOcclusion != 5) { - const float aovalues[] = float[](0.5, 0.75, 0.9, 1.0); + const float aovalues[] = float[](0.25, 0.5, 0.75, 1.0); v_ambientOcclusion = aovalues[int(ambientOcclusion)]; } else { v_ambientOcclusion = 1.0; diff --git a/source/client/core/Config.cpp b/source/client/core/Config.cpp index 0147f72b4..1a893c170 100644 --- a/source/client/core/Config.cpp +++ b/source/client/core/Config.cpp @@ -50,7 +50,7 @@ bool Config::isCrosshairVisible = true; // Graphics u16 Config::renderDistance = 8; -u8 Config::ambientOcclusion = 2; +u8 Config::ambientOcclusion = 1; bool Config::isSmoothLightingEnabled = true; bool Config::isWireframeModeEnabled = false; bool Config::isFullscreenModeEnabled = false; diff --git a/source/client/states/SettingsMenuState.cpp b/source/client/states/SettingsMenuState.cpp index 887ea6cd4..a2874572d 100644 --- a/source/client/states/SettingsMenuState.cpp +++ b/source/client/states/SettingsMenuState.cpp @@ -220,8 +220,8 @@ void SettingsMenuState::addGraphicsButtons() { const std::string aoValueNames[3] = { "OFF", - "Normal", - "Smooth Lighting" + "Fast", + "Fancy" }; m_menuWidget.addButton(std::string("Ambient Occlusion: ") + aoValueNames[Config::ambientOcclusion], [&, aoValueNames] (TextButton &button) {