This commit is contained in:
Bartek Stalewski 2017-03-05 23:36:30 +01:00
parent a1714c2510
commit 27e3d71720
3 changed files with 7 additions and 9 deletions

View File

@ -48,7 +48,7 @@
<command></command> <command></command>
<keyCode>-1</keyCode> <keyCode>-1</keyCode>
<keyModifier>-1</keyModifier> <keyModifier>-1</keyModifier>
<Key isActive="yes" isFolder="no"> <Key isActive="no" isFolder="no">
<name>temp_bindf5</name> <name>temp_bindf5</name>
<packageName></packageName> <packageName></packageName>
<script>scripts.temp_binds.execute_temp_bind(&quot;f5&quot;)</script> <script>scripts.temp_binds.execute_temp_bind(&quot;f5&quot;)</script>
@ -56,7 +56,7 @@
<keyCode>16777268</keyCode> <keyCode>16777268</keyCode>
<keyModifier>0</keyModifier> <keyModifier>0</keyModifier>
</Key> </Key>
<Key isActive="yes" isFolder="no"> <Key isActive="no" isFolder="no">
<name>temp_bindf6</name> <name>temp_bindf6</name>
<packageName></packageName> <packageName></packageName>
<script>scripts.temp_binds.execute_temp_bind(&quot;f6&quot;)</script> <script>scripts.temp_binds.execute_temp_bind(&quot;f6&quot;)</script>
@ -72,7 +72,7 @@
<keyCode>16777270</keyCode> <keyCode>16777270</keyCode>
<keyModifier>0</keyModifier> <keyModifier>0</keyModifier>
</Key> </Key>
<Key isActive="yes" isFolder="no"> <Key isActive="no" isFolder="no">
<name>temp_bindf8</name> <name>temp_bindf8</name>
<packageName></packageName> <packageName></packageName>
<script>scripts.temp_binds.execute_temp_bind(&quot;f8&quot;)</script> <script>scripts.temp_binds.execute_temp_bind(&quot;f8&quot;)</script>

View File

@ -604,7 +604,7 @@ raiseEvent(&quot;playBeep&quot;)</script>
<colorTriggerFgColor>#000000</colorTriggerFgColor> <colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor> <colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList> <regexCodeList>
<string>(Zrecznie zaslaniasz|Na rozkaz .* zaslaniasz) .*</string> <string>.*(Zrecznie zaslaniasz|Na rozkaz .* zaslaniasz) .*</string>
<string>.* zagradzasz .* droge.*</string> <string>.* zagradzasz .* droge.*</string>
<string>.* szybko przesuwa sie za ciebie, kryjac sie przed .*</string> <string>.* szybko przesuwa sie za ciebie, kryjac sie przed .*</string>
<string>.* rzuca sie do ataku na ciebie!</string> <string>.* rzuca sie do ataku na ciebie!</string>

View File

@ -32,8 +32,6 @@ ateam.all_numbering = false
-- 1 - tylko atak ('zabij') -- 1 - tylko atak ('zabij')
-- 2 - tylko atak + wskazanie ('zabij' + 'wskaz ... jako cel ataku') -- 2 - tylko atak + wskazanie ('zabij' + 'wskaz ... jako cel ataku')
-- 3 - komplet ('zabij', 'wskaz', 'rozkaz wszystkim zaatakowac ...') -- 3 - komplet ('zabij', 'wskaz', 'rozkaz wszystkim zaatakowac ...')
--
-- Komenda do zmiany w trakcie gry: '/rozkazuj'
ateam.attack_mode = 1 ateam.attack_mode = 1
------------------------------------------ ------------------------------------------
@ -360,8 +358,8 @@ scripts.gag_settings = {
["innych_uniki"] = 2, ["innych_uniki"] = 2,
["moje_parowanie"] = 2, ["moje_parowanie"] = 2,
["innych_parowanie"] = 2, ["innych_parowanie"] = 2,
["zaslony_udane"] = 0, ["zaslony_udane"] = 2,
["zaslony_nieudane"] = 0, ["zaslony_nieudane"] = 2,
["cele"] = 2, ["cele"] = 2,
["rozkazy"] = 2, ["rozkazy"] = 2,
["ogluchy"] = 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.55, function () scripts.people:color_people_starter() end)
tempTimer(0.7, function () scripts.people:trigger_people_starter() end) tempTimer(0.7, function () scripts.people:trigger_people_starter() end)
tempTimer(1, function () expandAlias("/ui_restart", false) 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.5, function () scripts.ui:set_gag_options() end)
tempTimer(1.7, function () misc.lang:init() end) tempTimer(1.7, function () misc.lang:init() end)