Nowosc: status broni; ogolne porzadki w statusbarze.

This commit is contained in:
Bartek Stalewski 2013-12-20 23:22:35 +01:00
parent fb1d5a6f57
commit 50e9ce36c7
7 changed files with 345 additions and 327 deletions

View file

@ -31,7 +31,7 @@
/eval /set alarm=$[decode_attr("none", {zc_main})]
/def bd = \
/send opusc wszystkie bronie %;\
/send %{opusccmd-opusc} wszystkie bronie %;\
/if ( {pochwa} =~ "on" )\
/send powsun %bron do %pochwa1 %;\
/if ( {dual} =~ "on" ) \

View file

@ -184,25 +184,25 @@
/def _odliczaj_zaslone = \
/set nxt_zaslona=$[strcat(decode_attr("4", {zc_crit}))]%;\
/repeat -00:00:01.25 1 /set nxt_zaslona=$$[strcat(decode_attr("3", {zc_crit}))]%;\
/repeat -00:00:01.25 1 /set nxt_zaslona=$$[strcat(decode_attr("3", {zc_alarm}))]%;\
/repeat -00:00:02.35 1 /set nxt_zaslona=$$[strcat(decode_attr("2", {zc_alarm}))]%;\
/repeat -00:00:03.45 1 /set nxt_zaslona=$$[strcat(decode_attr("1", {zc_alarm}))]%;\
/repeat -00:00:04.58 1 /set nxt_zaslona=$$[strcat(decode_attr("rdy", {zc_main}))]
/repeat -00:00:03.45 1 /set nxt_zaslona=$$[strcat(decode_attr("1", {zc_crit}))]%;\
/repeat -00:00:04.58 1 /set nxt_zaslona=$$[strcat(decode_attr("ready", {zc_main}))]
/def _odliczaj_rozkaz = \
/set nxt_order=$[strcat(decode_attr("12", {zc_crit}))]%;\
/repeat -00:00:01.00 1 /set nxt_order=$$[strcat(decode_attr("11", {zc_crit}))]%;\
/repeat -00:00:02.05 1 /set nxt_order=$$[strcat(decode_attr("10", {zc_crit}))]%;\
/repeat -00:00:03.10 1 /set nxt_order=$$[strcat(decode_attr("9", {zc_crit}))]%;\
/repeat -00:00:04.20 1 /set nxt_order=$$[strcat(decode_attr("8", {zc_crit}))]%;\
/repeat -00:00:05.25 1 /set nxt_order=$$[strcat(decode_attr("7", {zc_crit}))]%;\
/repeat -00:00:06.30 1 /set nxt_order=$$[strcat(decode_attr("6", {zc_crit}))]%;\
/repeat -00:00:07.35 1 /set nxt_order=$$[strcat(decode_attr("5", {zc_alarm}))]%;\
/repeat -00:00:08.40 1 /set nxt_order=$$[strcat(decode_attr("4", {zc_alarm}))]%;\
/repeat -00:00:09.45 1 /set nxt_order=$$[strcat(decode_attr("3", {zc_alarm}))]%;\
/repeat -00:00:10.50 1 /set nxt_order=$$[strcat(decode_attr("2", {zc_alarm}))]%;\
/repeat -00:00:11.55 1 /set nxt_order=$$[strcat(decode_attr("1", {zc_alarm}))]%;\
/repeat -00:00:12.60 1 /set nxt_order=$$[strcat(decode_attr("rdy", {zc_main}))]
/repeat -00:00:01.00 1 /set nxt_order=$$[strcat(decode_attr("11", {zc_alarm}))]%;\
/repeat -00:00:02.05 1 /set nxt_order=$$[strcat(decode_attr("10", {zc_alarm}))]%;\
/repeat -00:00:03.10 1 /set nxt_order=$$[strcat(decode_attr("9", {zc_alarm}))]%;\
/repeat -00:00:04.20 1 /set nxt_order=$$[strcat(decode_attr("8", {zc_alarm}))]%;\
/repeat -00:00:05.25 1 /set nxt_order=$$[strcat(decode_attr("7", {zc_alarm}))]%;\
/repeat -00:00:06.30 1 /set nxt_order=$$[strcat(decode_attr("6", {zc_alarm}))]%;\
/repeat -00:00:07.35 1 /set nxt_order=$$[strcat(decode_attr("5", {zc_crit}))]%;\
/repeat -00:00:08.40 1 /set nxt_order=$$[strcat(decode_attr("4", {zc_crit}))]%;\
/repeat -00:00:09.45 1 /set nxt_order=$$[strcat(decode_attr("3", {zc_crit}))]%;\
/repeat -00:00:10.50 1 /set nxt_order=$$[strcat(decode_attr("2", {zc_crit}))]%;\
/repeat -00:00:11.55 1 /set nxt_order=$$[strcat(decode_attr("1", {zc_crit}))]%;\
/repeat -00:00:12.60 1 /set nxt_order=$$[strcat(decode_attr("ready", {zc_main}))]
/def _odliczaj_blok = \
/set blokowanko=$[strcat("[", decode_attr(" ", {zc_crit_background}), "] ")]%;\
@ -222,20 +222,21 @@
/eval /status_add -c -r1 "[ " czy_kierunek_jest_nw:1 czy_kierunek_jest_n:1 czy_kierunek_jest_ne:2 czy_kierunek_jest_u:1 " ] "::
/eval /status_add -r1 "K: ":: kondycja:24
/eval /status_add -r1 "Z: ":: zmeczenie:24
/eval /status_add -r1 "Hide: ":: hide:3:C%c_main
/eval /status_add -r1 " Sneak: ":: sneak:4:C%c_main
/eval /status_add -r1 "Hidden: ":: hide:4:C%c_main
/eval /status_add -r1 " Cover: ":: nxt_zaslona:5
/eval /status_add -r1 "Mail: ":: poczta_show:5:C%c_main
/eval /status_add -c -r2 "[ ":: czy_kierunek_jest_w:1 "#":1:C%c_alarm czy_kierunek_jest_e:2 czy_kierunek_jest_d:1 " ] "::
/eval /status_add -r2 "B: ":: blokowanko:24
/eval /status_add -r2 "W: ":: warningstat:24
/eval /status_add -r2 "Zasl: ":: nxt_zaslona:4
/eval /status_add -r2 "Order: ":: nxt_order:4
/eval /status_add -r2 "Sneaky: ":: sneak:4:C%c_main
/eval /status_add -r2 "Order: ":: nxt_order:5
/eval /status_add -r2 "Warn: ":: alarm:20
/eval /status_add -c -r3 "[ ":: czy_kierunek_jest_sw:1 czy_kierunek_jest_s:1 czy_kierunek_jest_se:2 czy_kierunek_jest_inne:1 " ] "::
/eval /status_add -r3 "R: [ ":: wskazanie:47:C%c_alarm
/eval /status_add -r3 "] Bind: ":: bindings:35:C%c_info
/eval /status_add -r3 "] Weapon: ":: weaponstat:4:C%c_main
/eval /status_add -r3 "tBind:":: bindings:35:C%c_info
/eval /status_add -r3 spacebreak::
/eval /status_add -r3 ownkills:3:C%c_main
/eval /status_add -r3 "/ ":: allkills:3:C%c_main

View file

@ -9,8 +9,20 @@
/send wez %{*} z siodmego ciala %;\
/send wez %{*} z osmego ciala
/def -Fp2 -ar -t'* rozpada sie!*' = /beep 1
/def -Fp2 -ar -t'* peka!*' = /beep 1
/def -ar -mregexp -Fp2 -t'^[a-z]+ [a-z]+ [a-z]+ rozpada sie!*' = /beep 1
/def -mregexp -Fp2 -t'(Dobywasz|Wiedziony naglym instynktem siegasz|Trzymasz.*(w prawej|w lewej|oburacz))' weapon_on = \
/set weaponstat=ON%;\
/status_edit -r3 weaponstat:4:C%c_alarm
/def -mregexp -Fp2 -t'(^Opuszczasz | ogarniajac wzrokiem cala okolice)' weapon_off = \
/set weaponstat=off%;\
/status_edit -r3 weaponstat:4:C%c_main
/def -ar -mregexp -Fp2 -t'^[a-z]+ [a-z]+ [a-z]+ (?:|bojowa |bojowy )peka!' weapon_break = \
/beep 1%;\
/set weaponstat=!!!%;\
/status_edit -r3 weaponstat:4:C%c_crit
/def -mregexp -p2 -t'bierze twoj.' = /set moje on
/def -mregexp -p2 -t'konczy prace.$' = \
@ -57,7 +69,6 @@
/dp monety %;\
/endif%;\
/endif
/alias do_kowal /do_kowal
/def -mregexp -p2 -t'.* (pochodnia|luczywo) wypala sie i gasnie\.' light_off0 = \

View file

@ -12,7 +12,7 @@
/endif %;\
/elseif ({*} =~ 'clear') \
/unset ogolne_poczta %;\
/status_edit -r1 poczta_show:5:C%{c_main} %;\
/status_edit -r1 poczta_show:5:C%c_main %;\
/set poczta_show=none %;\
/endif
@ -26,7 +26,7 @@
/else \
/set poczta_show=MAIL%;\
/endif %;\
/status_edit -r1 poczta_show:5:C%{c_alarm}
/status_edit -r1 poczta_show:5:C%c_alarm
/def -mregexp -Fp2 -t'^Masz nowa poczte od (.*).' _poczta_1 = \
/set ogolne_poczta=$[strcat({ogolne_poczta},ftime("%H:%M",time()),{P1},"|")] %;\
@ -36,7 +36,7 @@
/else \
/set poczta_show=MAIL%;\
/endif %;\
/status_edit -r1 poczta_show:5:C%{c_alarm}
/status_edit -r1 poczta_show:5:C%c_alarm
/def -mregexp -Fp2 -t'^Masz nowy list.*od ([^ ]*), zatytulowany \'(.*)(\'|[^.]$)' _poczta_2 = \
/set ogolne_poczta=$[strcat({ogolne_poczta},ftime("%H:%M",time()),{P1}," zatytulowany '",{P2},"'|")] %;\
@ -46,4 +46,4 @@
/else \
/set poczta_show=MAIL%;\
/endif %;\
/status_edit -r1 poczta_show:5:C%{c_alarm}
/status_edit -r1 poczta_show:5:C%c_alarm

View file

@ -213,13 +213,13 @@
/echo -p #@{C%c_info}#@{n}# Przemykanie: @{C%c_info}%sneak@{n}%;\
/elseif ( {1} =~ "off" ) \
/set sneak %{1} %;\
/status_edit -r1 sneak:4:C%{c_main} %;\
/status_edit -r2 sneak:4:C%{c_main} %;\
/elseif ( {1} =~ "ON" ) \
/set sneak %{1} %;\
/status_edit -r1 sneak:4:C%{c_alarm} %;\
/status_edit -r2 sneak:4:C%{c_alarm} %;\
/elseif ( {1} =~ "TEAM" ) \
/set sneak %{1} %;\
/status_edit -r1 sneak:4:C%{c_alarm} %;\
/status_edit -r2 sneak:4:C%{c_alarm} %;\
/endif
/def hide = \

View file

@ -15,6 +15,7 @@
/set ownkills=0
/set allkills=0
/set poczta_show=none
/set weaponstat=???
/eval /set alarm=$[decode_attr("none", {zc_main})]
/eval /set nxt_zaslona=$[decode_attr("rdy", {zc_main})]

View file

@ -64,6 +64,11 @@
/endif %;\
/sneak %sneak %;\
/hide %hide %;\
/if ( {weaponstat} =~ "ON" )\
/weapon_on%;\
/elseif ( {weaponstat} =~ "!!!" )\
/weapon_break%;\
/endif%;\
/f1 %f1 %;\
/f2 %f2 %;\
/f3 %f3 %;\