tBKwtWS 7 år sedan
förälder
incheckning
3d9c01e668

+ 1 - 1
irc/commands/games.py

@@ -164,7 +164,7 @@ def do_command(self, connection, event):
             level, xp, xpspent, totalxp, karma, coin, coinspent, coingiven, ap, apspent = GameHelpers.get_info(self, user)
             if ap < 0:
                 ap = 0
-            connection.privmsg(replyto, message + "Level: " + str(level) + grey + ", " + reset + "XP: " + grey + str(xpspent) + "/" + reset + str(round(xp + xpspent, 4)) + grey + ", " + reset + "AP: " + str(int(ap)) + grey + ", " + reset + "coin: " + str(coin) + grey + "[S " + str(coinspent) + ", G " + str(coingiven) + "], " + reset + "karma: " + str(round(karma, 4)))
+            connection.privmsg(replyto, message + "Level: " + str(level) + grey + ", " + reset + "XP: " + grey + str(xpspent) + "/" + reset + str(round(xp, 4)) + grey + ", " + reset + "AP: " + str(int(ap)) + grey + ", " + reset + "coin: " + str(coin) + grey + "[S " + str(coinspent) + ", G " + str(coingiven) + "], " + reset + "karma: " + str(round(karma, 4)))
     
     elif command.split()[0] == "levelup":
         if cmdtype == "help":    #Display help text.

+ 3 - 2
webgui/stats/templates/stats/network.html

@@ -131,7 +131,8 @@
             </div>
         </section>
     </article>
-    <div class="ui basic segment">
+    <div class="ui divider"></div>
+    <div class="ui center aligned container">
          <article class="ui stackable cards">
             <script type="text/javascript">
                 google.charts.load("current", {packages:["corechart"]});
@@ -465,7 +466,7 @@
                     </div>
                 </section>
             {% endif %}
-            {% if totalcoingiven != 0 %}
+            {% if totalcoingiven != 0 and totalcoinspent != 0 %}
                 <script type="text/javascript">
                     google.charts.load("current", {packages:["corechart"]});
                     google.charts.setOnLoadCallback(drawChart8);

+ 7 - 7
webgui/webgui/common/convert_units.py

@@ -1,18 +1,18 @@
 def shorten_number (number):
     if len(str(number)) > 20:
-        number = str(number /1000000000000000000) +"E"
+        number = str(int(number /1000000000000000000)) +"E"
     if len(str(number)) > 17:
-        number = str(number /1000000000000000) +"P"
+        number = str(int(number /1000000000000000)) +"P"
     if len(str(number)) > 14:
-        number = str(number /1000000000000) +"T"
+        number = str(int(number /1000000000000)) +"T"
     if len(str(number)) > 11:
-        number = str(number /1000000000) +"G"
+        number = str(int(number /1000000000)) +"G"
     if len(str(number)) > 8:
-        number = str(number /1000000) +"M"
+        number = str(int(number /1000000)) +"M"
     if len(str(number)) > 5:
-        number = str(number /1000) + "K"
+        number = str(int(number /1000)) + "K"
     if len(str(number)) > 4:
-        number = str(number /100) + "h"
+        number = str(int(number /100)) + "h"
     else:
         number = int(number)
     return str(number)