diff --git a/modules/tfw.py b/modules/tfw.py index 13eccef..130b301 100644 --- a/modules/tfw.py +++ b/modules/tfw.py @@ -15,7 +15,7 @@ import metar import web -def tfw(phenny, input, fahrenheit=False, celsius=False): +def tfw(phenny, input, fahrenheit=False, celsius=False, meV=False): """.tfw - Show the fucking weather at the specified location.""" where = input.group(2) @@ -50,9 +50,11 @@ def tfw(phenny, input, fahrenheit=False, celsius=False): temp = "{0:d}°F‽".format(int(tempf)) elif celsius: temp = "{0:d}°C‽".format(w.temperature) - else: + elif meV: tempev = (w.temperature + 273.15) * 8.617343e-5 * 1000 temp = "%f meV‽" % tempev + else: + temp = "{0:f} Meters‽".format((w.temperature + 273.15) * 8.617343e-5 * 12.39842) if w.temperature < 6: remark = "IT'S FUCKING COLD" @@ -192,7 +194,7 @@ def tfw(phenny, input, fahrenheit=False, celsius=False): temp=temp, remark=remark, flavor=flavor, location=w.station, time=w.time.strftime("%H:%M")) phenny.say(response) -tfw.rule = (['tfw'], r'(.*)') +tfw.rule = (['tfw', 'tfwm'], r'(.*)') def tfwf(phenny, input): @@ -206,6 +208,10 @@ def tfwc(phenny, input): return tfw(phenny, input, celsius=True) tfwc.rule = (['tfwc'], r'(.*)') +def tfweV(phenny, input): + """.tfwc - The fucking weather, in fucking degrees celsius.""" + return tfw(phenny, input, meV=True) +tfweV.rule = (['tfweV', 'tfwev'], r'(.*)') if __name__ == '__main__': print(__doc__.strip())