changeset 172:8834425a85b0 beta

Traipse Beta 'OpenRPG' {091210-01} 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 (Beta) New Features: Added Bookmarks Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager New TrueDebug Class in orpg_log (See documentation for usage) Portable Mercurial Tip of the Day added, from Core and community New Reference Syntax added for custom PC sheets New Child Reference for gametree New Gametree Recursion method, mapping, context sensitivity, and effeciency.. New Features node with bonus nodes and Node Referencing help added Added 7th Sea die roller method; ie [7k3] = [7d10.takeHighest(3).open(10)] New 'Mythos' System die roller added Added new vs. die roller method for WoD; ie [3v3] = [3d10.vs(3)]. Includes support for Mythos roller. Fixes: Fix to Text based Server Fix to Remote Admin Commands Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Fix to Map from gametree not showing to all clients Fix to gametree about menus Fix to Password Manager check on startup Fix to PC Sheets from tool nodes. They now use the tabber_panel Fixed Whiteboard ID to prevent random line or text deleting. Modified ID's to prevent non updated clients from ruining the fix. default_manifest.xml renamed to default_upmana.xml Fix to Update Manager; cleaner clode for saved repositories Fixes made to Settings Panel and no reactive settings when Ok is pressed.
author sirebral
date Thu, 10 Dec 2009 23:16:08 -0600
parents ff48c2741fe7
children 0d9b746b5751
files orpg/dieroller/__init__.py orpg/dieroller/utils.py orpg/orpg_version.py orpg/templates/nodes/die_roller_notes.xml
diffstat 3 files changed, 122 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/orpg/dieroller/utils.py	Thu Dec 10 23:16:08 2009 -0600
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+# Copyright (C) 2000-2001 The OpenRPG Project
+#
+#       openrpg-dev@lists.sourceforge.net
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# --
+#
+# File: dieroller/utils.py
+# Author: OpenRPG Team
+# Maintainer:
+# Version:
+#   $Id: utils.py,v 1.22 2007/05/05 05:30:10 digitalxero Exp $
+#
+# Description: Classes to help manage the die roller
+#
+
+__version__ = "$Id: utils.py,v 1.22 2007/05/05 05:30:10 digitalxero Exp $"
+
+import re
+
+import orpg.dieroller.rollers
+from orpg.dieroller.base import die_rollers
+
+class roller_manager(object):
+    def __new__(cls):
+        it = cls.__dict__.get("__it__")
+        if it is not None: return it
+        cls.__it__ = it = object.__new__(cls)
+        it._init()
+        return it
+
+    def _init(self):
+        self.setRoller('std')
+
+    def setRoller(self, roller_class):
+        try: self.roller_class = die_rollers[roller_class]
+        except KeyError: raise Exception("Invalid die roller!")
+
+    def getRoller(self):
+        return self.roller_class.name
+
+    def listRollers(self):
+        return die_rollers.keys()
+
+    def stdDieToDClass(self,match):
+        s = match.group(0)
+        num_sides = s.split('d')
+        if len(num_sides) > 1: num_sides; num = num_sides[0]; sides = num_sides[1]
+        else: return self.non_stdDieToDClass(s) # Use a non standard converter.
+
+        if sides.strip().upper() == 'F': sides = "'f'"
+        try:
+            if int(num) > 100 or int(sides) > 10000: return None
+        except: pass
+        ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](",
+                sides.strip(), '))']
+        return ''.join(ret)
+
+    def non_stdDieToDClass(self, s):
+        num_sides = s.split('v')
+        if len(num_sides) > 1: 
+            num_sides; num = num_sides[0]; sides = num_sides[1]
+            if self.getRoller() == 'mythos': sides = '12'; target = num_sides[1]
+            elif self.getRoller() == 'wod': sides = '10'; target = num_sides[1]
+            ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](",
+                    sides.strip(), ')).vs(', target, ')']
+            return ''.join(ret)
+
+        num_sides = s.split('k')
+        if len(num_sides) > 1: 
+            num_sides; num = num_sides[0]; sides = '10'; target = num_sides[1]
+            ret = ['(', num.strip(), "**die_rollers['", self.getRoller(), "'](",
+                    sides.strip(), ')).takeHighest(', target, ').open(10)']
+            return ''.join(ret)
+
+    #  Use this to convert ndm-style (3d6) dice to d_base format
+    def convertTheDieString(self,s):
+        reg = re.compile("(?:\d+|\([0-9\*/\-\+]+\))\s*[a-zA-Z]+\s*[\dFf]+")
+        (result, num_matches) = reg.subn(self.stdDieToDClass, s)
+        if num_matches == 0 or result is None:
+            try:
+                s2 = self.roller_class + "(0)." + s
+                test = eval(s2)
+                return s2
+            except: pass
+        return result
+
+    def proccessRoll(self, s):
+        return str(eval(self.convertTheDieString(s)))
--- a/orpg/orpg_version.py	Thu Dec 10 22:30:40 2009 -0600
+++ b/orpg/orpg_version.py	Thu Dec 10 23:16:08 2009 -0600
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse Beta"
 DIS_VER = "Ornery Orc"
-BUILD = "091210-00"
+BUILD = "091210-01"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"
--- a/orpg/templates/nodes/die_roller_notes.xml	Thu Dec 10 22:30:40 2009 -0600
+++ b/orpg/templates/nodes/die_roller_notes.xml	Thu Dec 10 23:16:08 2009 -0600
@@ -70,7 +70,7 @@
 [1d20.attack(20,5,19) - make an attack roll against AC 20 with a modifier of +5 and a critical range of 19-20.
 </text>
   </nodehandler>
-  <nodehandler class="textctrl_handler" icon="note" map="Die Roller Notes" module="forms" name="wod roller" version="1.0">
+  <nodehandler class="textctrl_handler" icon="note" map="Die Roller Notes" module="forms" name="WoD roller" version="1.0">
     <text multiline="1" send_button="1">Remember, to use the wod roller type: "/dieroller wod"
 
 vs(target) - vs roll against target
@@ -80,7 +80,24 @@
 The wod roller also has a shortend version in Traipse.
 [3v5] = [3d10.vs(5)]</text>
   </nodehandler>
-  <nodehandler class="textctrl_handler" icon="note" map="Die Roller Notes" module="forms" name="mythos roller" version="1.0">
+  <nodehandler class="textctrl_handler" icon="note" map="Die Roller Notes" module="forms" name="Alternity Roller" version="1.0">
+    <text multiline="1" send_button="1">Remember, to use the mythos roller type: "/dieroller alternity"
+
+The alternity roller is a roller designed by community members. The roller has two syntax methods for skill and attack.
+
+Skill:
+[1d20.sk(1, 0)]
+
+Attack:
+[1d20.at(2, 1, (1d6, 's'), (2d6, 'w'), (1d8, 'm')]
+
+You can use the attack syntax and roll your attack as well as damage for an Ordinary success, a Good success, and a Criticial success.
+
+The letters in the die rolls indicate what type of damage is dealt.
+'s' = Stun
+'w' = Wound
+'m' = Mortal</text>
+  </nodehandler><nodehandler class="textctrl_handler" icon="note" map="Die Roller Notes" module="forms" name="Mythos roller" version="1.0">
     <text multiline="1" send_button="1">Remember, to use the mythos roller type: "/dieroller mythos"
 
 The mythos roller is a roller designed by community request. The roller uses a new style of versus similar to the wod roller.