Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

improve calc, make users savable

Browse Source
This commit is contained in:
jomo
2015-01-02 02:17:17 +01:00
parent f2a30f3aa2
commit d92f98307f
1 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
calc.py
View File

@@ -1,6 +1,6 @@
from helpers import * from helpers import *
evals_toggle_list = [] calc_users = open_json_file("calc", [])
math_operators = ["+", "-", "*", "/", "&", "|"] math_operators = ["+", "-", "*", "/", "&", "|"]
ignore_operators = ["**", "&&", "||"] # ** may be too intensive, the others cause syntax errors ignore_operators = ["**", "&&", "||"] # ** may be too intensive, the others cause syntax errors
calc_perm = "utils.calc" calc_perm = "utils.calc"
@@ -38,7 +38,7 @@ def calc(text):
def on_calc_chat(event): def on_calc_chat(event):
sender = event.getPlayer() sender = event.getPlayer()
message = event.getMessage() message = event.getMessage()
if not event.isCancelled() and sender.getName() in evals_toggle_list and sender.hasPermission(calc_perm): if not event.isCancelled() and uid(sender) in calc_users and sender.hasPermission(calc_perm):
output = calc(message) output = calc(message)
if output: if output:
msg(sender, "&2=== Calc: &e" + output[0] + " &2= &c" + output[1]) msg(sender, "&2=== Calc: &e" + output[0] + " &2= &c" + output[1])
@@ -47,31 +47,23 @@ def on_calc_chat(event):
@hook.command("calc", description="Toggles chat calculations") @hook.command("calc", description="Toggles chat calculations")
def on_calc_command(sender, args): def on_calc_command(sender, args):
plugin_header(sender, "Chat Calculator") plugin_header(sender, "Chat Calculator")
if len(args): if not sender.hasPermission(calc_perm):
if not sender.hasPermission(calc_perm): noperm(sender)
noperm(sender) return True
return if not checkargs(sender, args, 0, 1):
target = args[0].lower() return True
if not is_player(target):
msg(sender, "&cLooks like %s isn't a player at all!" % target)
return
target = server.getPlayer(target)
status = "disabled" target = server.getPlayer(args[0:1]) or sender
if target.getName() in evals_toggle_list: if not is_player(target):
evals_toggle_list.remove(target.getName()) msg(sender, "&cLooks like %s isn't a player at all!" % target)
else: return True
status = "enabled"
evals_toggle_list.append(target.getName()) toggle(target, calc_users)
msg(target, "&6We just &e%s&6 Chat Calculator for you!" % status) save_json_file("calc", calc_users)
status = "enabled" if uid(target) in calc_users else "disabled"
msg(target, "&6We just &e%s&6 Chat Calculator for you!" % status)
if target != sender:
msg(sender, "&6We &e%s&6 this player's Chat Calculator" % status) msg(sender, "&6We &e%s&6 this player's Chat Calculator" % status)
return return True
status = "disabled"
if sender.getName() in evals_toggle_list:
evals_toggle_list.remove(sender.getName())
else:
status = "enabled"
evals_toggle_list.append(sender.getName())
msg(sender, "&6We just &e%s&6 Chat Calculator for you!" % status)