Mercurial > traipse_dev

comparison orpg/dieroller/rollers/ironclaw.py @ 245:682032381be8 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Beta 'OpenRPG' {101130-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 New IronClaw roller, sheet, and image 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 Update to Hidden Die plugin, allows for non standard dice rolls 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 Fix to Send to Chat from Gametree Fix to Gametree, renaming and remapping operates correctly Fix to aliaslib, prevents error caused when SafeHTML is sent None
author sirebral
date Tue, 30 Nov 2010 02:34:58 -0600
parents 3bbfd84619c0
children 1df5912db00c
comparison
equal deleted inserted replaced
244:be04d07341f3 245:682032381be8
290 myStr += str(mod)+ ' Fatigue '; tie = False 290 myStr += str(mod)+ ' Fatigue '; tie = False
291 for x in range(0, mod): 291 for x in range(0, mod):
292 f += 1 292 f += 1
293 if f > t: 293 if f > t:
294 f -= 1; cW += 1 294 f -= 1; cW += 1
295 if (cW >= 6) and not tie: 295 if (cW >= mW-6) and not tie:
296 deathTest = self.deathTest(cW, body) 296 deathTest = self.deathTest(cW+(12-mW), body)
297 if deathTest[0] == 'Dead': tie = True; myStr += deathTest[1] 297 if deathTest[0] == 'Dead': tie = True; myStr += deathTest[1]
298 if deathTest[2] in ['failure', 'riposte', 'tie', 'botch']: tie = True; myStr += deathTest[1] 298 if deathTest[2] in ['failure', 'riposte', 'tie', 'botch']: tie = True; myStr += deathTest[1]
299 else: myStr += deathTest[1] 299 else: myStr += deathTest[1]
300 if action == 'wounds': 300 if action == 'wounds':
301 myStr += str(int(fabs(mod)))+ ' Wounds '; tie = False 301 myStr += str(int(fabs(mod)))+ ' Wounds '; tie = False
302 if mod > 0: 302 if mod > 0:
303 for x in xrange(0, mod): 303 for x in xrange(0, mod):
304 cW += 1 304 cW += 1
305 if (cW >= 6) and not tie: 305 if (cW >= mW-6) and not tie:
306 deathTest = self.deathTest(cW, body) 306 deathTest = self.deathTest(cW+(12-mW), body)
307 if deathTest[0] == 'Dead': tie = True; myStr += deathTest[1] 307 if deathTest[0] == 'Dead': tie = True; myStr += deathTest[1]
308 if deathTest[2] in ['failure', 'riposte', 'tie', 'botch']: tie = True; myStr += deathTest[1] 308 if deathTest[2] in ['failure', 'riposte', 'tie', 'botch']: tie = True; myStr += deathTest[1]
309 else: myStr += deathTest[1] 309 else: myStr += deathTest[1]
310 else: cW += mod 310 else: cW += mod
311 if cW < 0: cW = 0 311 if cW < 0: cW = 0