chiark
/
gitweb
/
~matthewv
/
irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new flirts from rejs
[irc.git]
/
config.py
diff --git
a/config.py
b/config.py
index 1f989c6a048c36a00cdf547579e8e8372fca3e9d..092ca82f2895d2810e1b3985b95be5028d3f0fae 100644
(file)
--- a/
config.py
+++ b/
config.py
@@
-37,15
+37,15
@@
import commands as c
# This fishpond is shared between trouts and flirts. It doesn't have to be;
# you can define as many ponds as you like.
# This fishpond is shared between trouts and flirts. It doesn't have to be;
# you can define as many ponds as you like.
-class
fish
:
+class
Fish (c.FishPond)
:
cur_fish=5
max_fish=5
nofish_time=60
fish_time_inc=60
fish_inc=2
cur_fish=5
max_fish=5
nofish_time=60
fish_time_inc=60
fish_inc=2
- DoS=0
Boring_Git='Nobody'
Boring_Git='Nobody'
- quotatime=0
+
+fish = Fish()
# load a file full of flirts or trouts
def __load(filename):
# load a file full of flirts or trouts
def __load(filename):
@@
-60,6
+60,7
@@
def __load(filename):
# (troutlist,selftroutmsg,DoSmsg,notargetmsg,nofishmsg,fishpond,selftroutprob)
troutcfg = (
__load("trouts"),
# (troutlist,selftroutmsg,DoSmsg,notargetmsg,nofishmsg,fishpond,selftroutprob)
troutcfg = (
__load("trouts"),
+ __load("trouts-local"),
' (at the instigation of %s)',
"Sorry, but %s is being a spoilsport.",
"Who do you wish me to trout?",
' (at the instigation of %s)',
"Sorry, but %s is being a spoilsport.",
"Who do you wish me to trout?",