broke a lot of stuff. semi-fixed the console itself.
This commit is contained in:
parent
e1face5735
commit
448d5982fa
@ -1,11 +1,10 @@
|
|||||||
import tpt
|
import tpt
|
||||||
import random
|
import random
|
||||||
|
import time
|
||||||
# example script
|
# example script
|
||||||
|
|
||||||
def noise(typ,amount=50):
|
def noise(typ,amount=50):
|
||||||
for xx in range(284,316):
|
for xx in range(284,316):
|
||||||
for yy in range(184,216):
|
for yy in range(184,216):
|
||||||
if(random.randrange(0,100)<amount):
|
if(random.randrange(0,100)<amount):
|
||||||
tpt.create(xx,yy,typ)
|
tpt.create(xx,yy,typ)
|
||||||
|
|
||||||
|
|
@ -5,12 +5,12 @@ import ctypes
|
|||||||
import traceback
|
import traceback
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
print "console module loaded."
|
print "console module loaded."
|
||||||
"""#redirect stdout like this:
|
#redirect stdout like this:
|
||||||
class logger:
|
class logger:
|
||||||
def write(self,txt):
|
def write(self,txt):
|
||||||
txt=txt[:254]
|
txt=txt.split("\n")[-1][:254]
|
||||||
tpt.log(txt)
|
tpt.log(txt)
|
||||||
sys.stdout=logger()"""
|
#sys.stdout=logger()
|
||||||
|
|
||||||
element={"none":0,"dust":1,"watr":2,"oil":3,"fire":4,"stne":5,"lava":6,"gunp":7,
|
element={"none":0,"dust":1,"watr":2,"oil":3,"fire":4,"stne":5,"lava":6,"gunp":7,
|
||||||
"nitr":8,"clne":9,"gas":10,"plex":11,"goo":12,"icei":13,"metl":14,"sprk":15,
|
"nitr":8,"clne":9,"gas":10,"plex":11,"goo":12,"icei":13,"metl":14,"sprk":15,
|
||||||
@ -36,19 +36,6 @@ element={"none":0,"dust":1,"watr":2,"oil":3,"fire":4,"stne":5,"lava":6,"gunp":7,
|
|||||||
"lote":142,"frg2":143,"star":144,"frog":145,"bran":146,"wind":147,
|
"lote":142,"frg2":143,"star":144,"frog":145,"bran":146,"wind":147,
|
||||||
"num":148}
|
"num":148}
|
||||||
|
|
||||||
def _async_raise(tid, exctype):
|
|
||||||
'''Raises an exception in the threads with id tid'''
|
|
||||||
if not inspect.isclass(exctype):
|
|
||||||
raise TypeError("Only types can be raised (not instances)")
|
|
||||||
res = ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, ctypes.py_object(exctype))
|
|
||||||
if res == 0:
|
|
||||||
raise ValueError("invalid thread id")
|
|
||||||
elif res != 1:
|
|
||||||
# """if it returns a number greater than one, you're in trouble,
|
|
||||||
# and you should call it again with exc=NULL to revert the effect"""
|
|
||||||
ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, 0)
|
|
||||||
raise SystemError("PyThreadState_SetAsyncExc failed")
|
|
||||||
|
|
||||||
class _fork(Thread):
|
class _fork(Thread):
|
||||||
def __init__ (self,func):
|
def __init__ (self,func):
|
||||||
Thread.__init__(self)
|
Thread.__init__(self)
|
||||||
@ -65,6 +52,7 @@ def fork(func):
|
|||||||
fork.threads[fork.i]=tmp
|
fork.threads[fork.i]=tmp
|
||||||
fork.i+=1
|
fork.i+=1
|
||||||
tmp.start()
|
tmp.start()
|
||||||
|
return tmp
|
||||||
tpt.log("Thread #%d started"%(fork.i-1))
|
tpt.log("Thread #%d started"%(fork.i-1))
|
||||||
def fork_status():
|
def fork_status():
|
||||||
count=0
|
count=0
|
||||||
@ -86,7 +74,7 @@ def error(ex):
|
|||||||
def clean():
|
def clean():
|
||||||
#add any functions that must be reachable here.
|
#add any functions that must be reachable here.
|
||||||
copy=["__builtins__","__name__","__doc__","__package__",'tpt','clean',
|
copy=["__builtins__","__name__","__doc__","__package__",'tpt','clean',
|
||||||
'element','fork','_fork','fork_status','fork_unblock']
|
'element','fork','_fork','fork_status','fork_unblock','sys']
|
||||||
handle.glob={}
|
handle.glob={}
|
||||||
for item in copy:
|
for item in copy:
|
||||||
handle.glob[item]=globals()[item]
|
handle.glob[item]=globals()[item]
|
||||||
@ -104,27 +92,11 @@ def handle(txt):
|
|||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
|
||||||
def _handle(txt):
|
def _handle(txt):
|
||||||
print "handling '%s'"%txt
|
#print "handling '%s'"%txt
|
||||||
tpt.console_less()
|
exec txt in handle.glob
|
||||||
try:
|
if(False):
|
||||||
#tmp=code.compile_command('\n'.join(handle.txt))
|
|
||||||
tmp=code.compile_command(txt)
|
|
||||||
except Exception as ex:
|
|
||||||
#tpt.log("Invalid code. see stdout for more info.")
|
|
||||||
error(ex)
|
|
||||||
print "### -------------------- trace"
|
|
||||||
traceback.print_exc()
|
|
||||||
return
|
|
||||||
if(tmp==None):
|
|
||||||
tpt.console_more()
|
tpt.console_more()
|
||||||
else:
|
else:
|
||||||
try:
|
tpt.console_less()
|
||||||
#print "executing"
|
|
||||||
exec tmp in handle.glob
|
|
||||||
except Exception as ex:
|
|
||||||
#tpt.log("Invalid code. see stdout for more info.")
|
|
||||||
error(ex)
|
|
||||||
print "### -------------------- trace"
|
|
||||||
traceback.print_exc()
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user