Merge pull request #6 from jwinterm/master

merge
This commit is contained in:
ferretinjapan 2017-07-03 05:30:54 +09:30 committed by GitHub
commit 2ee7558b79
2 changed files with 51 additions and 48 deletions

View File

@ -675,7 +675,7 @@ def commodity(bot, trigger):
commodity_key = 'B1ZnykTmG6_A1vkwzt9u'
input_com = trigger.group(2).upper()
if input_com == ('AU' or 'GOLD' or 'XAU'):
commodity = 'AU_EGL'
commodity = 'AU_EIB'
unit = 'oz'
elif input_com == ('AG' or 'SILVER' or 'XAG'):
commodity = 'AG_USD'

View File

@ -597,51 +597,54 @@ def whaleornot(bot, trigger):
if not trigger.group(2):
bot.say("Gotta have skin in the game to be a big fish! Add some XMR after the command to see what level the player is at!")
else
xmr_size = int(trigger.group(2))
if xmr_size < 0.1:
fish_string = "plankton"
elif xmr_size >= 0.1 and xmr_size < 0.2:
fish_string = "Paedocypris"
elif xmr_size >= 0.2 and xmr_size < 0.5:
fish_string = "Dwarf Goby"
elif xmr_size >= 0.5 and xmr_size < 1:
fish_string = "European Pilchard"
elif xmr_size >= 1 and xmr_size < 2:
fish_string = "Goldfish"
elif xmr_size >= 2 and xmr_size < 5:
fish_string = "Herring"
elif xmr_size >= 5 and xmr_size < 10:
fish_string = "Atlantic Macerel"
elif xmr_size >= 10 and xmr_size < 20:
fish_string = "Gilt-head Bream"
elif xmr_size >= 20 and xmr_size < 50:
fish_string = "Salmonidae"
elif xmr_size >= 50 and xmr_size < 100:
fish_string = "Gadidae"
elif xmr_size >= 100 and xmr_size < 200:
fish_string = "Norwegian Delicious Salmon"
elif xmr_size >= 200 and xmr_size < 500:
fish_string = "Electric eel"
elif xmr_size >= 500 and xmr_size < 1000:
fish_string = "Tuna"
elif xmr_size >= 1000 and xmr_size < 2000:
fish_string = "Wels catfish"
elif xmr_size >= 2000 and xmr_size < 5000:
fish_string = "Black marlin"
elif xmr_size >= 5000 and xmr_size < 10000:
fish_string = "Shark"
elif xmr_size >= 10000 and xmr_size < 20000:
fish_string = "Dolphin"
elif xmr_size >= 20000 and xmr_size < 40000:
fish_string = "Narwhal"
elif xmr_size >= 40000 and xmr_size < 60000:
fish_string = "Orca"
elif xmr_size >= 60000 and xmr_size < 100000:
fish_string = "Blue Whale"
elif xmr_size >= 100000 and xmr_size < 200000:
fish_string = "Leviathan"
elif xmr_size >= 200000:
fish_string = "Cthulu"
else:
try:
xmr_size = int(trigger.group(2))
if xmr_size < 0.1:
fish_string = "plankton"
elif xmr_size >= 0.1 and xmr_size < 0.2:
fish_string = "Paedocypris"
elif xmr_size >= 0.2 and xmr_size < 0.5:
fish_string = "Dwarf Goby"
elif xmr_size >= 0.5 and xmr_size < 1:
fish_string = "European Pilchard"
elif xmr_size >= 1 and xmr_size < 2:
fish_string = "Goldfish"
elif xmr_size >= 2 and xmr_size < 5:
fish_string = "Herring"
elif xmr_size >= 5 and xmr_size < 10:
fish_string = "Atlantic Macerel"
elif xmr_size >= 10 and xmr_size < 20:
fish_string = "Gilt-head Bream"
elif xmr_size >= 20 and xmr_size < 50:
fish_string = "Salmonidae"
elif xmr_size >= 50 and xmr_size < 100:
fish_string = "Gadidae"
elif xmr_size >= 100 and xmr_size < 200:
fish_string = "Norwegian Delicious Salmon"
elif xmr_size >= 200 and xmr_size < 500:
fish_string = "Electric eel"
elif xmr_size >= 500 and xmr_size < 1000:
fish_string = "Tuna"
elif xmr_size >= 1000 and xmr_size < 2000:
fish_string = "Wels catfish"
elif xmr_size >= 2000 and xmr_size < 5000:
fish_string = "Black marlin"
elif xmr_size >= 5000 and xmr_size < 10000:
fish_string = "Shark"
elif xmr_size >= 10000 and xmr_size < 20000:
fish_string = "Dolphin"
elif xmr_size >= 20000 and xmr_size < 40000:
fish_string = "Narwhal"
elif xmr_size >= 40000 and xmr_size < 60000:
fish_string = "Orca"
elif xmr_size >= 60000 and xmr_size < 100000:
fish_string = "Blue Whale"
elif xmr_size >= 100000 and xmr_size < 200000:
fish_string = "Leviathan"
elif xmr_size >= 200000:
fish_string = "Cthulu"
bot.say("{0} level.".format(fish_string))
except:
bot.say("Try a base ten representation of a number")
bot.say("{0} level.".format(fish_string))