From 9633f7a5142025a437554425a3d848c5a5f580fb Mon Sep 17 00:00:00 2001 From: Alexander Yakovlev Date: Fri, 17 Mar 2017 16:21:26 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=86=D0=B0=20=D0=B8=D0=B3=D1=80=D1=8B=20=D0=B8=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=D0=B0=20=D0=9A=D0=B0=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locations/abandoned.lua | 2 +- locations/chos.lua | 16 +++++++++++++++- tools.lua | 10 ++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/locations/abandoned.lua b/locations/abandoned.lua index 1ecef0d..aa90e01 100644 --- a/locations/abandoned.lua +++ b/locations/abandoned.lua @@ -286,7 +286,7 @@ obj { disp = 'автомобиль'; dsc = 'Недалеко от вас припаркован ваш {автомобиль.}'; tak = function() - enable('end-game') + char.can_leave = true p 'Вы вынимаете ключи из замка зажигания. Больше никто не угонит авто просто так.' return true end diff --git a/locations/chos.lua b/locations/chos.lua index d4eb8e1..3dbef37 100644 --- a/locations/chos.lua +++ b/locations/chos.lua @@ -223,7 +223,21 @@ dlg { onempty = function() return "Она отворачивается. Видимо, разговор закончен." end, - {'Привет.', 'Привет.'}; + { + '#привет', + 'Привет.', + function() + disable '#привет' + return 'Привет.' + end + }; + { + 'Покажешь дорогу до этого Павла?', + function() + walk 'pavels' + return 'Ну пошли.' + end, + }; { always = true, function() diff --git a/tools.lua b/tools.lua index 573cc45..fb4f7b4 100644 --- a/tools.lua +++ b/tools.lua @@ -11,6 +11,7 @@ init = function () char.wounds = 0 char.actions = 50 char.reputation = 50 + char.can_leave = false place(menu { nam = "Персонаж", menu = function() @@ -37,11 +38,16 @@ init = function () }, me()) place(menu { nam = "end-game", - disp = fmt.b("Уехать"), + disp = function() + if char.can_leave then + return fmt.b("Уехать") + end + return false + end, menu = function() walk('ending') end - }:disable(), me()) + }, me()) char.act = nil place( proxy_menu { disp = 'ОСМОТРЕТЬ';