From 27e3d7172042298a15e8ba7f91c09582fa40d556 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Sun, 5 Mar 2017 23:36:30 +0100 Subject: [PATCH] . --- keys.xml | 6 +++--- triggers.xml | 2 +- werbat.txt | 8 +++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/keys.xml b/keys.xml index 165bfe0..cc09fe2 100644 --- a/keys.xml +++ b/keys.xml @@ -48,7 +48,7 @@ -1 -1 - + temp_bindf5 @@ -56,7 +56,7 @@ 16777268 0 - + temp_bindf6 @@ -72,7 +72,7 @@ 16777270 0 - + temp_bindf8 diff --git a/triggers.xml b/triggers.xml index 44b0a3d..13d1b60 100644 --- a/triggers.xml +++ b/triggers.xml @@ -604,7 +604,7 @@ raiseEvent("playBeep") #000000 #000000 - (Zrecznie zaslaniasz|Na rozkaz .* zaslaniasz) .* + .*(Zrecznie zaslaniasz|Na rozkaz .* zaslaniasz) .* .* zagradzasz .* droge.* .* szybko przesuwa sie za ciebie, kryjac sie przed .* .* rzuca sie do ataku na ciebie! diff --git a/werbat.txt b/werbat.txt index b3d9ba6..ea50fd9 100644 --- a/werbat.txt +++ b/werbat.txt @@ -32,8 +32,6 @@ ateam.all_numbering = false -- 1 - tylko atak ('zabij') -- 2 - tylko atak + wskazanie ('zabij' + 'wskaz ... jako cel ataku') -- 3 - komplet ('zabij', 'wskaz', 'rozkaz wszystkim zaatakowac ...') --- --- Komenda do zmiany w trakcie gry: '/rozkazuj' ateam.attack_mode = 1 ------------------------------------------ @@ -360,8 +358,8 @@ scripts.gag_settings = { ["innych_uniki"] = 2, ["moje_parowanie"] = 2, ["innych_parowanie"] = 2, - ["zaslony_udane"] = 0, - ["zaslony_nieudane"] = 0, + ["zaslony_udane"] = 2, + ["zaslony_nieudane"] = 2, ["cele"] = 2, ["rozkazy"] = 2, ["ogluchy"] = 2, @@ -469,6 +467,6 @@ tempTimer(0.4, function () scripts.people:enemy_people_starter() end) tempTimer(0.55, function () scripts.people:color_people_starter() end) tempTimer(0.7, function () scripts.people:trigger_people_starter() end) tempTimer(1, function () expandAlias("/ui_restart", false) end) -tempTimer(0.4, function () misc_load_dump() end) +tempTimer(1.1, function() amap:check_room_gps_options() end) tempTimer(1.5, function () scripts.ui:set_gag_options() end) tempTimer(1.7, function () misc.lang:init() end)