scoobs
/
monerobux
mirror of https://github.com/jwinterm/monerobux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
parent 17ec4702f0 0142fcb49d
commit 2ee7558b79
2 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
price.py
View File

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

7
trifling.py
View File

@ -597,7 +597,8 @@ def whaleornot(bot, trigger):
if not trigger.group(2): 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!") 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 else:
try:
xmr_size = int(trigger.group(2)) xmr_size = int(trigger.group(2))
if xmr_size < 0.1: if xmr_size < 0.1:
fish_string = "plankton" fish_string = "plankton"
@ -643,5 +644,7 @@ def whaleornot(bot, trigger):
fish_string = "Leviathan" fish_string = "Leviathan"
elif xmr_size >= 200000: elif xmr_size >= 200000:
fish_string = "Cthulu" fish_string = "Cthulu"
bot.say("{0} level.".format(fish_string)) bot.say("{0} level.".format(fish_string))
except:
bot.say("Try a base ten representation of a number")