diff options
| -rw-r--r-- | builtin/client/cheats.lua | 3 | ||||
| -rw-r--r-- | builtin/settingtypes.txt | 8 | ||||
| -rw-r--r-- | src/client/game.cpp | 7 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 5 |
4 files changed, 10 insertions, 13 deletions
diff --git a/builtin/client/cheats.lua b/builtin/client/cheats.lua index 1abc2c8ef..1efe4f0b9 100644 --- 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 0d4985138..334c25dda 100644 --- 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 18707306c..816f8f307 100644 --- 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 580db99f1..aceb8f63b 100644 --- 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"); |