Rework Range

diff --git a/builtin/client/cheats.lua b/builtin/client/cheats.lua
index 1abc2c8ef7c476ce3d44eca16f9e23c52266c140..1efe4f0b9673419bf2245c99ca8fe4546da9abbd 100644 (file)
--- a/builtin/client/cheats.lua
+++ b/builtin/client/cheats.lua
@@ -44,8 +44,7 @@ core.cheats = {
        ["Player"] = {
                ["NoFallDamage"] = "prevent_natural_damage",
                ["NoForceRotate"] = "no_force_rotate",
-               ["IncreasedRange"] = "increase_tool_range",
-               ["UnlimitedRange"] = "increase_tool_range_plus",
+               ["Reach"] = "reach",
                ["PointLiquids"] = "point_liquids",
                ["PrivBypass"] = "priv_bypass",
                ["AutoRespawn"] = "autorespawn",

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 0d49851382079995988931e78a25c7fcd4ea0bd6..334c25dda2260ae18bf897025d27a2f7b2223c41 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2251,10 +2251,6 @@ freecam (Freecam) bool false
 
 no_hurt_cam (NoHurtCam) bool false
 
-increase_tool_range (IncreasedRange) bool true
-
-increase_tool_range_plus (IncreasedRangePlus) bool true
-
 hud_flags_bypass (HUDBypass) bool true
 
 antiknockback (AntiKnockback) bool false
@@ -2302,3 +2298,7 @@ enable_node_tracers (NodeTracers) bool false
 entity_esp_color (EntityESP Color) v3f 255, 255, 255
 
 player_esp_color (PlayerESP Color) v3f 0, 255, 0
+
+tool_range (Additional Tool Range) int 2
+
+reach (Reach) bool false

diff --git a/src/client/game.cpp b/src/client/game.cpp
index 18707306cc93c80dcf837357a424dd491b294177..816f8f307f077c656a8da77c871b12c4b60535af 100644 (file)
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2288,10 +2288,9 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
        const ItemDefinition &selected_def = selected_item.getDefinition(itemdef_manager);
        f32 d = getToolRange(selected_def, hand_item.getDefinition(itemdef_manager));
        
-       if (g_settings->getBool("increase_tool_range"))
-               d += 2;
-       if (g_settings->getBool("increase_tool_range_plus"))
-               d = 1000;
+       
+       if (g_settings->getBool("reach"))
+               d += g_settings->getU16("tool_range");
 
        core::line3d<f32> shootline;
 

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 580db99f1b6ec995f9c9f033080650dac547ba04..aceb8f63b8ce740f7482214a1ba285694f599dea 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -85,8 +85,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("freecam", "false");
        settings->setDefault("killaura", "false");
        settings->setDefault("no_hurt_cam", "false");
-       settings->setDefault("increase_tool_range", "true");
-       settings->setDefault("increase_tool_range_plus", "false");
+       settings->setDefault("reach", "true");
        settings->setDefault("hud_flags_bypass", "true");
        settings->setDefault("antiknockback", "false");
        settings->setDefault("entity_speed", "false");
@@ -116,7 +115,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_node_tracers", "false");
        settings->setDefault("entity_esp_color", "(255, 255, 255)");
        settings->setDefault("player_esp_color", "(0, 255, 0)");        
-       settings->setDefault("scaffold", "false");                                                      // For now      
+       settings->setDefault("tool_range", "2");
 
        // Keymap
        settings->setDefault("remote_port", "30000");