diff orpg/dieroller/base.py @ 239:56c1f2729413 beta

Traipse Beta 'OpenRPG' {100811-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary (Closing/Closed) New Features: New to Map, can re-order Grid, Miniatures, and Whiteboard layer draw order New to Server GUI, can now clear log New Earthdawn Dieroller Updates: Update to Warhammer PC Sheet. Rollers set as macros. Should work with little maintanence. Update to Browser Server window. Display rooms with ' " & cleaner Update to Server. Handles ' " & cleaner. Update to Dieroller. Cleaner, more effecient expression system. Fixes: Fix to InterParse that was causing an Infernal Loop with Namespace Internal Fix to XML data, removed old Minidom and switched to Element Tree Fix to Server that was causing eternal attempt to find a Server ID, in Register Rooms thread Fix to metaservers.xml file not being created Fix to Single and Double quotes in Whiteboard text Fix to Background images not showing when using the Image Server Fix to Duplicate chat names appearing Fix to Server GUI's logging output Fix to FNB.COLORFUL_TABS bug Fix to Gametree for XSLT Sheets Fix to Gametree for locating gametree files
author sirebral
date Wed, 11 Aug 2010 13:52:30 -0500
parents 13054be69834
children
line wrap: on
line diff
--- a/orpg/dieroller/base.py	Sat Jun 19 10:17:24 2010 -0500
+++ b/orpg/dieroller/base.py	Wed Aug 11 13:52:30 2010 -0500
@@ -126,6 +126,7 @@
         elif hasattr(other,"sum"): return  cmp(self.sum(), other.sum())
         else: return UserList.UserList.__cmp__(self,other)
 
+
     def __rcmp__(self,other):
         return self.__cmp__(other)
 
@@ -229,7 +230,7 @@
 ### di class to handle actual dice
 
 class di:
-    def __init__(self, sides, min=1):
+    def __init__(self,sides,min=1):
         self.sides = sides
         self.history = None
         self.value = None
@@ -263,6 +264,7 @@
     def __int__(self):
         return self.value
 
+
     def __lt__(self,other):
         if type(other) == type(3) or type(other) == type(3.0): return self.value < other
         elif hasattr(other,"value"): return self.value < other.value