bugfixes

rotbot/commands/common.py

@@ -165,8 +165,8 @@ class GameHelpers():
         print('curse_add_karma:' + str(curse_add_karma) + ' = ((total_cursewords_added:' + str(total_cursewords_added) + ' + total_curseadjectives_added:' + str(total_curseadjectives_added) + ') * 10 ) / total_xp:'+ str(total_xp))
         curse_ban_karma = ((total_cursewords_banned + total_curseadjectives_banned) * 50) / total_xp
         print('curse_ban_karma:' + str(curse_ban_karma) + ' = ((total_cursewords_banned:' + str(total_cursewords_banned) + ' + total_curseadjectives_banned:' + str(total_curseadjectives_banned) + ') * 10 ) / total_xp:'+ str(total_xp))
-        wealth_karma = (coin * 50.1) / total_xp
-        print('wealth_karma:' + str(wealth_karma) + ' = (coin:' + str(coin) + ' * 50) / total_xp:' + str(total_xp))
+        wealth_karma = (coin * 10.1) / total_xp
+        print('wealth_karma:' + str(wealth_karma) + ' = (coin:' + str(coin) + ' * 10) / total_xp:' + str(total_xp))
         charity_karma = (coin_given * 10.1) / total_xp
         print('charity_karma:' + str(charity_karma) + ' = (coin_given:' + str(coin_given) + ' * 10) / total_xp:' + str(total_xp))
         elite_karma_bonus = 0

rotbot/events/on_privnotice.py

@@ -31,7 +31,7 @@ def process_event(self, connection, event):
             Inform.operators(self, connection, 'Regisring %s%s%s with %sNickServ%s.' % (font.red, self.network.nickname, font.reset, font.red, font.reset))
             connection.privmsg('NickServ', 'register %s spamtBK@xs4all.nl' % (self.network.password)) # Register with NickServ.
             return
-        elif event.arguments[0].startswith('Nickname ') and connection.get_nickname() in event.arguments[0] and ' registered' in event.arguments[0]:
+        elif event.arguments[0].startswith('Nickname ') and event.arguments[0].endswith('registered.') or event.arguments[0].startswith('Nickname ') and ' registered under your account: *' in event.arguments[0]:
             Inform.home_channel(self, connection, 'Registerred nickname %s%s%s with NickServ, adjusting settigns.' % font.red, self.network.nickname, font.reset)
             connection.privmsg('NickServ', 'ACCESS LIST')
             connection.privmsg('NickServ', 'AJOIN ADD %s' % (self.network.home_channel, queries.get_channel_key(self, self.network.home_channel)))
@@ -47,6 +47,10 @@ def process_event(self, connection, event):
             return
         elif event.arguments[0].startswith("You are already identified."):
             return
+        elif event.arguments[0].startswith('nick, type ') and '/msg NickServ IDENTIFY ' in event.arguments[0] and event.arguments[0].endswith(' Otherwise,'):
+            return
+        elif event.arguments[0].startswith("please choose a different nick."):
+            return
     elif event.source.nick == "ChanServ":
         if event.arguments[0].startswith("Key for channel ") and len(event.arguments[0]) > 5:   # Received channel key.
             log.info('Saving channel password received from NickServ for: %s' % event.arguments[0].split(' ')[3])

rotbot/events/on_welcome.py

@@ -10,8 +10,9 @@ def process_event(self, connection, event):
         if self.network.password:   # Password saved.
             connection.privmsg("NickServ", "identify " + self.network.password) # Identify with NickServ.
     if network_services == 'x': # X bot.
+        self.xbot = 'x@xhannels.%s' % '.'.join(event.source.split('.')[-2:])
         if self.network.password:   # Password saved.
-            connection.privmsg('x@channels.abovenet.org', 'LOGIN %s %s' % (self.networkself.nickname, self.network.password))   # Identify with X.
+            connection.privmsg(self.xbot, 'LOGIN %s %s' % (self.networkself.nickname, self.network.password))   # Identify with X.
 
     connection.mode(connection.get_nickname(), "+x")
 

website/rotbot/views/general.py

@@ -125,7 +125,7 @@ def user(request, user_slug):
 
     i = 0
     for dict in stats_dict:
-        color_gradient = linear_gradient(color_palette[i], n=87)
+        color_gradient = linear_gradient(color_palette[i], n=4)
         print(color_gradient)
         datasets.append({
             "label": dict,
@@ -135,7 +135,7 @@ def user(request, user_slug):
             #"pointBackgroundColor": ['rgba' + str(tuple(color_palette[i+1]))],
             #"pointBorderColor": ['rgba' + str(tuple(color_palette[i+3]))],
             #"pointStrokeColor": ['rgba' + str(tuple(color_palette[i+4]))],
-            "hoverBackgroundColor": 'rgba' + str(color_palette[i+5]),#, 'rgba' + str(tuple(color_palette[i+2])), 'rgba' + str(tuple(color_palette[i+2])), 'rgba' + str(tuple(color_palette[i+2])), 'rgba' + str(tuple(color_palette[i+2])),],
+            "hoverBackgroundColor": 'rgba' + str(color_palette[i+2]),#, 'rgba' + str(tuple(color_palette[i+2])), 'rgba' + str(tuple(color_palette[i+2])), 'rgba' + str(tuple(color_palette[i+2])), 'rgba' + str(tuple(color_palette[i+2])),],
             "hoverBorderColor": 'rgba' + str(color_palette[i+3]),#, 'rgba' + str(tuple(color_palette[i+3])), 'rgba' + str(tuple(color_palette[i+3])), 'rgba' + str(tuple(color_palette[i+3])), 'rgba' + str(tuple(color_palette[i+3])),],
             #"hoverWidth": 2,
             "borderWidth": 1,