aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/game.gd4
-rw-r--r--client/settings.gd1
-rw-r--r--locale/en.ini1
3 files changed, 4 insertions, 2 deletions
diff --git a/client/game.gd b/client/game.gd
index 304d88bd..aac5674b 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -188,7 +188,7 @@ func handle_packet(p):
var player: Player = players[p.player]
var item_name: String = item_names[p.message.item]
player.item_message(item_name, timeout_initial, timeout_remaining)
- if player.is_customer and not Global.get_profile("tutorials_played").has(item_name):
+ if player.is_customer and not Global.get_profile("tutorials_played").has(item_name) and not Global.get_setting("gameplay.tutorial_disabled"):
if tutorial_running:
tutorial_queue.push_back(item_name)
else:
@@ -247,7 +247,7 @@ func handle_packet(p):
while item_names[p.item] in tutorial_queue:
tutorial_queue.erase(item_names[p.item])
- if not tutorial_queue.is_empty():
+ if not tutorial_queue.is_empty() and not Global.get_setting("gameplay.tutorial_disabled"):
tutorial_running = true
update_tutorial_running.emit(tutorial_running)
mp.send_chat(player_id, "/start-tutorial %s" % tutorial_queue.pop_front())
diff --git a/client/settings.gd b/client/settings.gd
index 9318322b..6fab0d5c 100644
--- a/client/settings.gd
+++ b/client/settings.gd
@@ -25,6 +25,7 @@ static func get_root():
ToggleSetting.new("invert_camera", false),
ToggleSetting.new("usernames", true),
ToggleSetting.new("setup_completed", false),
+ ToggleSetting.new("tutorial_disabled", false),
ToggleSetting.new("tutorial_started", false),
ToggleSetting.new("latch_boost", true),
ToggleSetting.new("accessible_movement", false),
diff --git a/locale/en.ini b/locale/en.ini
index fd7d6038..8c3d57a6 100644
--- a/locale/en.ini
+++ b/locale/en.ini
@@ -68,6 +68,7 @@ c.settings.gameplay.interpolate_camera_rotation=Smooth camera rotation
c.settings.gameplay.invert_camera=Invert camera movement
c.settings.gameplay.latch_boost=Always extend boost to maximum duration
c.settings.gameplay.setup_completed=Initial setup complete. (Uncheck and restart to reenter)
+c.settings.gameplay.tutorial_disabled=Disable tutorial
c.settings.gameplay.tutorial_started=Tutorial started
c.settings.gameplay.usernames=Show username tags
c.settings.gameplay.accessible_movement=Accessible movement controls