Mercurial > traipse_dev

comparison orpg/dieroller/base.py @ 212:13054be69834 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Beta 'OpenRPG' {100428-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 (Patch-2) New Features: New Namespace method with two new syntaxes New Namespace Internal is context sensitive, always! New Namespace External is 'as narrow as you make it' New Namespace FutureCheck helps ensure you don't receive an incorrect node New PluginDB access for URL2Link plugin New to Forms, they now show their content in Design Mode New to Update Manager, checks Repo for updates on software start Fixes: Fix to Server GUI startup errors Fix to Server GUI Rooms tab updating Fix to Chat and Settings if non existant die roller is picked Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated Fix to Alias Lib's Export to Tree, Open, Save features Fix to alias node, now works properly Fix to Splitter node, minor GUI cleanup Fix to Backgrounds not loading through remote loader Fix to Node name errors Fix to rolling dice in chat Whispers Fix to Splitters Sizing issues Fix to URL2Link plugin, modified regex compilation should remove memory leak Fix to mapy.py, a roll back due to zoomed grid issues Fix to whiteboard_handler, Circles work by you clicking the center of the circle Fix to Servers parse_incoming_dom which was outdated and did not respect XML Fix to a broken link in the server welcome message Fix to InterParse and logger requiring traceback Fix to Update Manager Status Bar Fix to failed image and erroneous pop up
author sirebral
date Wed, 28 Apr 2010 08:08:09 -0500
parents dcae32e219f1
children 56c1f2729413
comparison
equal deleted inserted replaced
194:44ef45e77880 212:13054be69834
124 # methods overloaded above. 124 # methods overloaded above.
125 if type(other) == type(3) or type(other) == type(3.0): return cmp(self.sum(), other) 125 if type(other) == type(3) or type(other) == type(3.0): return cmp(self.sum(), other)
126 elif hasattr(other,"sum"): return cmp(self.sum(), other.sum()) 126 elif hasattr(other,"sum"): return cmp(self.sum(), other.sum())
127 else: return UserList.UserList.__cmp__(self,other) 127 else: return UserList.UserList.__cmp__(self,other)
128 128
129
130 def __rcmp__(self,other): 129 def __rcmp__(self,other):
131 return self.__cmp__(other) 130 return self.__cmp__(other)
132 131
133 def __add__(self,other): 132 def __add__(self,other):
134 mycopy = copy.deepcopy(self) 133 mycopy = copy.deepcopy(self)
228 return result 227 return result
229 228
230 ### di class to handle actual dice 229 ### di class to handle actual dice
231 230
232 class di: 231 class di:
233 def __init__(self,sides,min=1): 232 def __init__(self, sides, min=1):
234 self.sides = sides 233 self.sides = sides
235 self.history = None 234 self.history = None
236 self.value = None 235 self.value = None
237 self.target = None 236 self.target = None
238 self.roll(min) 237 self.roll(min)
261 if len(self.history) > 1: return str(self.history) 260 if len(self.history) > 1: return str(self.history)
262 else: return str(self.value) 261 else: return str(self.value)
263 262
264 def __int__(self): 263 def __int__(self):
265 return self.value 264 return self.value
266
267 265
268 def __lt__(self,other): 266 def __lt__(self,other):
269 if type(other) == type(3) or type(other) == type(3.0): return self.value < other 267 if type(other) == type(3) or type(other) == type(3.0): return self.value < other
270 elif hasattr(other,"value"): return self.value < other.value 268 elif hasattr(other,"value"): return self.value < other.value
271 else: return self < other 269 else: return self < other