Final modification for today

This commit is contained in:
Gap
2015-01-01 23:33:54 +01:00
parent e9c78edb46
commit 0448386fa7

21
calc.py
View File

@@ -6,8 +6,6 @@ calc_perm = "utils.calc"
def lex(msg): def lex(msg):
fullmessage = msg fullmessage = msg
msg = list(msg) msg = list(msg)
msg.append("f")
print(msg)
tok = "" tok = ""
expression = False expression = False
counter = 0 counter = 0
@@ -19,40 +17,37 @@ def lex(msg):
if char.isnumeric(): if char.isnumeric():
if not expression: if not expression:
startPos = counter startPos = counter
expression = True # expression = True
tok += char tok += char
elif char == "+" or char == "-" or char == "*" or char == "/": elif char == "+" or char == "-" or char == "*" or char == "/":
expression = True
tok += char tok += char
elif tok == " ": elif tok == " ":
if not expression: if not expression:
tok = "" tok = ""
else: else:
tok += char tok += char
elif char.isalpha(): if char.isalpha() or counter >= len(msg):
if expression: if expression:
msg = "".join(msg) msg = "".join(msg)
return_value = msg[0:startPos-1] result = str(eval(tok))
return_value += str(eval(tok))
return_value += msg[counter:]
expression = False expression = False
return return_value return result
else: else:
tok = "" tok = ""
return fullmessage return False
@hook.event("player.AsyncPlayerChatEvent", "high") @hook.event("player.AsyncPlayerChatEvent", "high")
def on_calc_chat(event): def on_calc_chat(event):
try:
sender = event.getPlayer() sender = event.getPlayer()
message = event.getMessage() message = event.getMessage()
if sender.getName() not in evals_toggle_list: if sender.getName() not in evals_toggle_list:
return return
output = lex(message) output = lex(message)
event.setMessage(colorify(str(output))) if output:
except Exception as e: msg(sender, "&2=== Calc: "+output)
print(e)
@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):