diff --git a/.bash_aliases b/.bash_aliases index 2b80d79..86ac393 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -6,7 +6,7 @@ alias la='ls -A' alias l='ls -CF' alias psg='ps -ef| grep' alias alpine='alpine -sort arrival/reverse' -alias biggest='du -a ~ | sort -n -r | head -n 10' +alias biggest='find ~ -type f -exec du -a {} + | sort -n -r | head -n 10' alias mudgame='telnet localhost 5071' function cdl(){ cd $@; ls -l; } alias mtrek='telnet mtrek.com 1701' diff --git a/Code/irc/log b/Code/irc/log index 2ec4978..a1c647b 100644 --- a/Code/irc/log +++ b/Code/irc/log @@ -10,3 +10,21 @@ Traceback (most recent call last): File "./topicbot.py", line 88, in def random_topic(channel, user, time, setTopic=false): NameError: name 'false' is not defined +Traceback (most recent call last): + File "./topicbot.py", line 193, in + listen() + File "./topicbot.py", line 162, in listen + count_topic(channel,user, time, messageText) + File "./topicbot.py", line 77, in count_topic + userscore = int(data[2])+1 +ValueError: invalid literal for int() with base 10: '1insom' +Traceback (most recent call last): + File "./topicbot.py", line 193, in + listen() + File "./topicbot.py", line 168, in listen + set_topic(channel, user, time, messageText[10:]) + File "./topicbot.py", line 86, in set_topic + count_topic(channel, user, time, msg) + File "./topicbot.py", line 77, in count_topic + userscore = int(data[2])+1 +ValueError: invalid literal for int() with base 10: '1vilmibm' diff --git a/Code/irc/tildebot.py b/Code/irc/tildebot.py index 598dc3a..96dc516 100755 --- a/Code/irc/tildebot.py +++ b/Code/irc/tildebot.py @@ -5,6 +5,7 @@ import socket import os import sys +import time from optparse import OptionParser import fileinput import random @@ -166,7 +167,7 @@ def listen(): # print formatted split = formatted.split("\t") - time = split[0] + iTime = split[0] user = split[1] command = split[2] channel = split[3] @@ -175,10 +176,10 @@ def listen(): if ircmsg.find(":!tildescore") != -1: show_tildescore(channel, user) elif ircmsg.find(":!tilde") != -1 and not challenges.has_key(user): - challenge(channel, user, time) + challenge(channel, user, iTime) elif challenges.has_key(user): - challenge_response(channel, user, time, messageText) - #give_tilde(channel, user, time) + challenge_response(channel, user, iTime, messageText) + #give_tilde(channel, user, iTime) if ircmsg.find(":!jackpot") != -1: show_jackpot(channel) @@ -190,6 +191,7 @@ def listen(): ping() sys.stdout.flush() + time.sleep(1) ircsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) connect(options.server, options.channel, options.nick) diff --git a/Code/irc/tildescores.txt b/Code/irc/tildescores.txt index 9bd6048..df377f3 100644 --- a/Code/irc/tildescores.txt +++ b/Code/irc/tildescores.txt @@ -1,20 +1,20 @@ -krowbar&^%219&^%1430329472 +krowbar&^%224&^%1434372702 karlen&^%271&^%1426779321 -endorphant&^%525&^%1430357885 +endorphant&^%584&^%1434930668 jumblesale&^%24&^%1426171214 -marcus&^%406&^%1430485408 -papa&^%48&^%1423148291 +marcus&^%540&^%1434989294 +papa&^%102&^%1434788735 epicmorphism&^%5&^%1421937744 -audy&^%71&^%1429709970 +audy&^%76&^%1431897326 kc&^%18&^%1422326056 vilmibm&^%9&^%1423247508 -cmr&^%86&^%1430441692 +cmr&^%452&^%1434995429 imt&^%519&^%1424087616 cndorphant&^%788&^%1424094192 rain&^%17&^%1422310975 sl2c&^%91&^%1424847521 selfsame&^%1&^%1422230012 -bear&^%187&^%1429911340 +bear&^%207&^%1434744601 coaxial&^%8&^%1422325983 joe&^%8&^%1422325983 hardmath123&^%4&^%1422325983 @@ -23,4 +23,4 @@ cel&^%11&^%1430162676 quote_bots&^%3&^%1424737471 bave&^%1&^%1427591141 scellef&^%13&^%1428707074 -cndorphbot&^%2&^%1430329439 +cndorphbot&^%6&^%1433564301 diff --git a/Code/irc/topics_#tildetown.txt b/Code/irc/topics_#tildetown.txt index de469cb..2651eae 100644 --- a/Code/irc/topics_#tildetown.txt +++ b/Code/irc/topics_#tildetown.txt @@ -80,3 +80,13 @@ 1430244952&^%krowbar&^%Tilde.town hard drive expansion fund: Let your interest be known at ~krowbar/public_html/donators.html 1430257496&^%vilmibm&^%donate to tilde.town / new disk! https://www.patreon.com/nathanielksmith | check out ~krowbar/public_html/donators.html 1430258808&^%vilmibm&^%downtime tonight for new disk! | donate to tilde.town! https://www.patreon.com/nathanielksmith | ~krowbar/public_html/donators.html +1430987764&^%jumblesale&^%VOTEAGEDDON 2015 | donations for tilde.town: https://www.patreon.com/nathanielksmith +1431352923&^%jumblesale&^%horses: architects of evil or just the benficiaries of an overwhelmingly evil system? | donations for tilde.town: https://www.patreon.com/nathanielksmith +1432773112&^%vilmibm&^%we are all so lovely | donations for tilde.town: https://www.patreon.com/nathanielksmith +1433350319&^%insom&^%what brought you to tilde? | donations for tilde.town: https://www.patreon.com/nathanielksmith +1433430134&^%krowbar&^%What was your favorite game demo and why? | donations for tilde.town: https://www.patreon.com/nathanielksmith +1433471973&^%hardmath123&^%Standardized tests make me sad. | donations for tilde.town: https://www.patreon.com/nathanielksmith +1434051213&^%krowbar&^%Got my mind on my tilde and tilde on my mind. | donations for tilde.town: https://www.patreon.com/nathanielksmith +1434162536&^%vilmibm&^%when was the last time you saw a whale or butterfly | donations for tilde.town: https://www.patreon.com/nathanielksmith +1434457394&^%krowbar&^%What languages (other than English) can you speak? | donations for tilde.town: https://www.patreon.com/nathanielksmith +1434995963&^%krowbar&^%What mannerisms have you picked up from friends or family? | donations for tilde.town: https://www.patreon.com/nathanielksmith diff --git a/Code/irc/topicscores.txt b/Code/irc/topicscores.txt index beb7131..a9ef3b0 100644 --- a/Code/irc/topicscores.txt +++ b/Code/irc/topicscores.txt @@ -1,14 +1 @@ -krowbar&^%22&^%35 -um&^%11&^%8 -kc&^%0&^%22 -marcus&^%4&^%1 -khoi&^%1&^%0 -karlen&^%0&^%10 -jumblesale&^%6&^%6 -dan&^%1&^%0 -datagrok&^%0&^%1 -papa&^%1&^%0 -vilmibm&^%1&^%18 -selfsame&^%1&^%0 -endorphant&^%0&^%7 -hardmath123&^%0&^%1 \ No newline at end of file +krowbar&^%0&^%1 \ No newline at end of file diff --git a/public_html/index.html b/public_html/index.html index 8c09025..e3c9fc3 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -9,5 +9,6 @@
  • Twine 2.0
  • Mission name generator
  • Grimoire: The Pathfinder Item Roller
    • +
  • Pragmatic Dice Bag