From 947993ecb059d25c8bf014e74a7d2aa9afe51f7a Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 25 Jan 2017 00:47:57 +0100 Subject: [PATCH] Colors. --- scripts.xml | 3 ++- triggers.xml | 35 ++++++++++++++++++++++++++++++++++- werbat.txt | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/scripts.xml b/scripts.xml index 0f3a59b..9bbf5a6 100644 --- a/scripts.xml +++ b/scripts.xml @@ -23,7 +23,8 @@ tempTimer(1, function () disableAlias("wez_monety_z") end) tempTimer(1, function () disableAlias("wloz_monety_do") end) tempTimer(1, function () disableTrigger("przelamanie") end) -tempTimer(1, function () disableTrigger("blokuje_cie") end) +tempTimer(1, function () disableTrigger("blokuje_cie") end) +tempTimer(1, function () disableTrigger("walczysz_bez_broni") end) fight-mnie-atakuja - @@ -1134,6 +1135,38 @@ end 1 + + ftpd-walczysz_bez_broni + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^(Nie udaje ci sie trafic|Probujesz trafic|Ledwo muskasz|Lekko ranisz) .* (lewa|prawa) piescia.*$ + ^(Nie udaje ci sie trafic|Probujesz trafic|Ledwo muskasz|Lekko ranisz) .* (lewym|prawym) kolanem.*$ + ^(Nie udaje ci sie trafic|Probujesz trafic|Ledwo muskasz|Lekko ranisz) .* (lewa|prawa) stopa.*$ + ^(Nie udaje ci sie trafic|Probujesz trafic|Ledwo muskasz|Lekko ranisz) .* (lewym|prawym) lokciem.*$ + + + 1 + 1 + 1 + 1 + + diff --git a/werbat.txt b/werbat.txt index c8505f3..7475e6e 100644 --- a/werbat.txt +++ b/werbat.txt @@ -325,7 +325,7 @@ scripts.gag_colors["innych_parowanie"] = "slate_gray" scripts.gag_colors["zaslony_udane"] = "deep_sky_blue" scripts.gag_colors["zaslony_nieudane"] = "dark_slate_blue" -scripts.gag_colors["bron"] = "yellow" +scripts.gag_colors["bron"] = "red" scripts.gag_colors["npc"] = "floral_white"