Lampa - by Daracan - poprawki ftpd

This commit is contained in:
Bartek Stalewski 2019-05-14 16:46:02 +02:00
parent ee124255cd
commit 1739dbed2c

View File

@ -1996,7 +1996,7 @@ scripts.ui:info_lamp_update("")</script>
<integer>1</integer> <integer>1</integer>
</regexCodePropertyList> </regexCodePropertyList>
</Trigger> </Trigger>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no"> <Trigger isActive="no" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>ftpd_daracan_lampa_timery_dopelnienie</name> <name>ftpd_daracan_lampa_timery_dopelnienie</name>
<script>selectCurrentLine() <script>selectCurrentLine()
fg("yellow") fg("yellow")
@ -2050,7 +2050,7 @@ scripts.utils.bind_functional("odloz olej; wez olej ze swojego plecaka; napelnij
fg("yellow") fg("yellow")
resetFormat() resetFormat()
cecho("&lt;green&gt; &gt;&gt; Wyciagnij butelke z plecaka!") cecho("&lt;green&gt; &gt;&gt; Wyciagnij butelke z plecaka!")
scripts.utils.bind_functional("odloz olej; wez olej ze swojego plecaka; napelnij lampe olejem", false, true)</script> scripts.utils.bind_functional("odloz olej; wez olej ze swojego plecaka; napelnij lampe olejem", false)</script>
<triggerType>0</triggerType> <triggerType>0</triggerType>
<conditonLineDelta>0</conditonLineDelta> <conditonLineDelta>0</conditonLineDelta>
<mStayOpen>0</mStayOpen> <mStayOpen>0</mStayOpen>
@ -2094,24 +2094,26 @@ end </script>
<packageName></packageName> <packageName></packageName>
<time>00:00:01.000</time> <time>00:00:01.000</time>
</Timer> </Timer>
<Timer isActive="yes" isFolder="no" isTempTimer="no" isOffsetTimer="no"> <Timer isActive="no" isFolder="no" isTempTimer="no" isOffsetTimer="no">
<name>ftpd_daracan_lamp_info_timer</name> <name>ftpd_daracan_lamp_info_timer</name>
<script>info_lamp_value = info_lamp_value - 1 <script>info_lamp_value = info_lamp_value - 1
scripts.ui.footer_info_lamp:echo("&lt;font color='"..scripts.ui["footer_info_normal"].."'&gt;Lampa:&lt;/font&gt; &lt;font color='"..scripts.ui["footer_info_green"].."'&gt;" .. SecondsToClock(info_lamp_value) .. "&lt;/font&gt;") scripts.ui.footer_info_lamp:echo("&lt;font color='"..scripts.ui["footer_info_normal"].."'&gt;Lampa:&lt;/font&gt; &lt;font color='"..scripts.ui["footer_info_green"].."'&gt;" .. SecondsToClock(info_lamp_value) .. "&lt;/font&gt;")
if info_lamp_value == 120 then if info_lamp_value == 120 then
cecho("\n&lt;yellow&gt; &gt;&gt;&gt; W lampie zostalo oleju na dwie minuty.\n\n") cecho("\n&lt;green&gt; &gt;&gt;&gt; Lamp: 2 min.\n\n")
elseif info_lamp_value == 60 then elseif info_lamp_value == 60 then
cecho("\n&lt;yellow&gt; &gt;&gt;&gt; W lampie zostalo oleju na jedna minute.\n\n") cecho("\n&lt;yellow&gt; &gt;&gt;&gt; Lamp: 1 min.\n\n")
elseif info_lamp_value == 30 then elseif info_lamp_value == 30 then
cecho("\n&lt;yellow&gt; &gt;&gt;&gt; W lampie zostalo oleju na pol minuty!\n\n") cecho("\n&lt;red&gt; &gt;&gt;&gt; Lamp: 30 secs!")
scripts.utils.bind_functional("napelnij lampe olejem", false)
elseif info_lamp_value == 10 then elseif info_lamp_value == 10 then
cecho("\n&lt;yellow&gt; &gt;&gt;&gt; LAMPA ZGASNIE ZA 10 SEKUND!\n\n") cecho("\n&lt;red&gt; &gt;&gt;&gt; LAMP: 10 SECS!")
os.execute("aplay " .. getMudletHomeDir() .. "/sounds/bell.wav &amp;") raiseEvent("playBeep")
scripts.utils.bind_functional("napelnij lampe olejem", false)
end end
if info_lamp_value &lt; 60 then if info_lamp_value &lt; 61 then
scripts.ui.footer_info_lamp:echo("&lt;font color='"..scripts.ui["footer_info_normal"].."'&gt;Lampa:&lt;/font&gt; &lt;font color='"..scripts.ui["footer_info_yellow"].."'&gt;" .. SecondsToClock(info_lamp_value) .. "&lt;/font&gt;") scripts.ui.footer_info_lamp:echo("&lt;font color='"..scripts.ui["footer_info_normal"].."'&gt;Lampa:&lt;/font&gt; &lt;font color='"..scripts.ui["footer_info_yellow"].."'&gt;" .. SecondsToClock(info_lamp_value) .. "&lt;/font&gt;")
end end
if info_lamp_value &lt; 31 then if info_lamp_value &lt; 31 then
@ -2371,7 +2373,7 @@ end</script>
sendAll("napelnij lampe olejem", "zapal lampe", false)</script> sendAll("napelnij lampe olejem", "zapal lampe", false)</script>
<command></command> <command></command>
<packageName></packageName> <packageName></packageName>
<regex>^/zap$</regex> <regex>^zap$</regex>
</Alias> </Alias>
<Alias isActive="yes" isFolder="no"> <Alias isActive="yes" isFolder="no">
<name>ftpd-zg</name> <name>ftpd-zg</name>
@ -2379,7 +2381,7 @@ sendAll("napelnij lampe olejem", "zapal lampe", false)</script>
expandAlias("/dp olej")</script> expandAlias("/dp olej")</script>
<command></command> <command></command>
<packageName></packageName> <packageName></packageName>
<regex>^/zg$</regex> <regex>^zg$</regex>
</Alias> </Alias>
</AliasGroup> </AliasGroup>
</AliasGroup> </AliasGroup>
@ -2917,8 +2919,7 @@ end</script>
<Script isActive="yes" isFolder="no"> <Script isActive="yes" isFolder="no">
<name>ftpd_daracan_main_footer_updater</name> <name>ftpd_daracan_main_footer_updater</name>
<packageName></packageName> <packageName></packageName>
<script>-- by Daracan <script>function scripts.ui:update_bars_mode(mode)
function scripts.ui:update_bars_mode(mode)
if not mode and mode ~= "gauge" and mode ~= "label" then if not mode and mode ~= "gauge" and mode ~= "label" then
error("Invalid input") error("Invalid input")
end end