Changeset 736


Ignore:
Timestamp:
02/21/11 22:51:42 (8 years ago)
Author:
aspidites
Message:

Patch by Aspidites:

  • renamed scripts package to parpg
  • renamed parpg module to application
  • removed packaging and other related files (kept locally for reference, will reintroduce similar scripts to resolve bug #275
  • updated all import statements to respect changes above
Location:
branches/active/character_customization
Files:
5 added
5 deleted
34 edited
54 moved

Legend:

Unmodified
Added
Removed
  • branches/active/character_customization/game/design/rev233_Class_Design.uml

    r247 r736  
    6363<XPD:OBJ name="NameCompartment" type="UMLNameCompartmentView" guid="xO4d9faF3hERlAAcJbjrOgAA"> 
    6464<XPD:OBJ name="NameLabel" type="LabelView" guid="ZO8d9faF3hERlAAcJbjrOgAA"> 
    65 <XPD:ATTR name="Text" type="string">scripts</XPD:ATTR> 
     65<XPD:ATTR name="Text" type="string">parpg</XPD:ATTR> 
    6666</XPD:OBJ> 
    6767<XPD:OBJ name="StereotypeLabel" type="LabelView" guid="BPAd9faF3hERlAAcJbjrOgAA"> 
     
    42624262</XPD:OBJ> 
    42634263<XPD:OBJ name="OwnedElements[6]" type="UMLPackage" guid="6LGNI/SF3hERlAAcJbjrOgAA"> 
    4264 <XPD:ATTR name="Name" type="string">scripts</XPD:ATTR> 
     4264<XPD:ATTR name="Name" type="string">parpg</XPD:ATTR> 
    42654265<XPD:REF name="Namespace">SKFi7PKF3hERlAAcJbjrOgAA</XPD:REF> 
    42664266<XPD:ATTR name="#Views" type="integer">1</XPD:ATTR> 
  • branches/active/character_customization/game/dialogue/dialogue.license

    r493 r736  
    1 Dialogue scripts: 
     1Dialogue parpg: 
    22(c) 2009 PARPG development team, http://www.parpg.net 
    33 
  • branches/active/character_customization/game/dialogue_demo.py

    r684 r736  
    2222import sys 
    2323 
    24 from scripts.common.optionparser import OptionParser, OptionError 
    25 from scripts.dialogueparsers import YamlDialogueParser 
    26 from scripts.dialogueprocessor import DialogueProcessor 
    27 from scripts.quest_engine import QuestEngine 
     24from parpg.common.optionparser import OptionParser, OptionError 
     25from parpg.dialogueparsers import YamlDialogueParser 
     26from parpg.dialogueprocessor import DialogueProcessor 
     27from parpg.quest_engine import QuestEngine 
    2828 
    2929def setupLogging(): 
  • branches/active/character_customization/game/dialogue_schema.yaml

    r668 r736  
    11--- 
    2 # A schema to validate dialogue scripts 
     2# A schema to validate dialogue parpg 
    33# to validate a script run: 
    44# 
  • branches/active/character_customization/game/license/gpl30.license

    r490 r736  
    134134  The "Corresponding Source" for a work in object code form means all 
    135135the source code needed to generate, install, and (for an executable 
    136 work) run the object code and to modify the work, including scripts to 
     136work) run the object code and to modify the work, including parpg to 
    137137control those activities.  However, it does not include the work's 
    138138System Libraries, or general-purpose tools or generally available free 
  • branches/active/character_customization/game/maps/maps.license

    r493 r736  
    1 Dialogue scripts: 
     1Dialogue parpg: 
    22(c) 2009 PARPG development team, http://www.parpg.net 
    33 
  • branches/active/character_customization/game/parpg/application.py

    r734 r736  
    2121from fife.extensions.basicapplication import ApplicationBase 
    2222 
    23 from scripts.gamemodel import GameModel 
    24 from scripts.mainmenuview import MainMenuView 
    25 from scripts import console 
    26 from scripts.mainmenucontroller import MainMenuController 
    27 from scripts.common.listeners.event_listener import EventListener 
    28 from scripts.common.listeners.key_listener import KeyListener 
    29 from scripts.common.listeners.mouse_listener import MouseListener 
    30 from scripts.common.listeners.command_listener import CommandListener 
    31 from scripts.common.listeners.console_executor import ConsoleExecuter 
    32 from scripts.common.listeners.widget_listener import WidgetListener 
     23from parpg.gamemodel import GameModel 
     24from parpg.mainmenuview import MainMenuView 
     25from parpg import console 
     26from parpg.mainmenucontroller import MainMenuController 
     27from parpg.common.listeners.event_listener import EventListener 
     28from parpg.common.listeners.key_listener import KeyListener 
     29from parpg.common.listeners.mouse_listener import MouseListener 
     30from parpg.common.listeners.command_listener import CommandListener 
     31from parpg.common.listeners.console_executor import ConsoleExecuter 
     32from parpg.common.listeners.widget_listener import WidgetListener 
    3333 
    3434class KeyFilter(fife.IKeyFilter): 
  • branches/active/character_customization/game/parpg/controllerbase.py

    r734 r736  
    1717from fife import fife 
    1818 
    19 from scripts.common.listeners.key_listener import KeyListener 
    20 from scripts.common.listeners.mouse_listener import MouseListener 
    21 from scripts.common.listeners.command_listener import CommandListener 
     19from parpg.common.listeners.key_listener import KeyListener 
     20from parpg.common.listeners.mouse_listener import MouseListener 
     21from parpg.common.listeners.command_listener import CommandListener 
    2222 
    2323class ControllerBase(KeyListener, MouseListener, CommandListener): 
     
    3333        @type engine: fife.Engine 
    3434        @param view: Instance of a GameSceneView 
    35         @param type: scripts.GameSceneView 
     35        @param type: parpg.GameSceneView 
    3636        @param model: The model that has the current gamestate 
    37         @type model: scripts.GameModel 
     37        @type model: parpg.GameModel 
    3838        @param application: The application that created this controller 
    39         @type application: scripts.PARPGApplication 
     39        @type application: parpg.PARPGApplication 
    4040        @param settings: The current settings of the application 
    4141        @type settings: fife.extensions.fife_settings.Setting 
  • branches/active/character_customization/game/parpg/dialogue.py

    r734 r736  
    2323except ImportError: 
    2424    # Python version 2.4-2.6 doesn't have the OrderedDict 
    25     from scripts.common.ordereddict import OrderedDict 
     25    from parpg.common.ordereddict import OrderedDict 
    2626 
    2727class Dialogue(object): 
  • branches/active/character_customization/game/parpg/dialoguecontroller.py

    r734 r736  
    2929        @type engine: fife.Engine 
    3030        @param view: Instance of a GameSceneView 
    31         @param type: scripts.GameSceneView 
     31        @param type: parpg.GameSceneView 
    3232        @param model: The model that has the current gamestate 
    33         @type model: scripts.GameModel 
     33        @type model: parpg.GameModel 
    3434        @param application: The application that created this controller 
    35         @type application: scripts.PARPGApplication 
     35        @type application: parpg.PARPGApplication 
    3636        @param settings: The current settings of the application 
    3737        @type settings: fife.extensions.fife_settings.Setting 
  • branches/active/character_customization/game/parpg/dialogueparsers.py

    r734 r736  
    3737except ImportError: 
    3838    # Python version 2.4-2.6 doesn't have the OrderedDict 
    39     from scripts.common.ordereddict import OrderedDict 
     39    from parpg.common.ordereddict import OrderedDict 
    4040import re 
    4141import textwrap 
     
    4343import yaml 
    4444 
    45 from scripts import COPYRIGHT_HEADER 
    46 from scripts.dialogue import (Dialogue, DialogueSection, DialogueResponse, 
     45from parpg import COPYRIGHT_HEADER 
     46from parpg.dialogue import (Dialogue, DialogueSection, DialogueResponse, 
    4747    DialogueGreeting) 
    48 from scripts.dialogueactions import DialogueAction 
     48from parpg.dialogueactions import DialogueAction 
    4949 
    5050def setup_logging(): 
  • branches/active/character_customization/game/parpg/dialogueprocessor.py

    r734 r736  
    2121import logging 
    2222 
    23 from scripts.common.utils import dedent_chomp 
     23from parpg.common.utils import dedent_chomp 
    2424 
    2525if (__debug__): 
    2626    from collections import Sequence, MutableMapping 
    27     from scripts.dialogue import Dialogue 
     27    from parpg.dialogue import Dialogue 
    2828 
    2929def setupLogging(): 
  • branches/active/character_customization/game/parpg/gamemap.py

    r734 r736  
    1919 
    2020from fife.extensions.loaders import loadMapFile 
    21 from scripts.common.utils import loadSettings 
     21from parpg.common.utils import loadSettings 
    2222 
    2323 
  • branches/active/character_customization/game/parpg/gamemodel.py

    r734 r736  
    3232from common.utils import parseBool 
    3333from inventory import Inventory 
    34 from scripts.dialogueparsers import YamlDialogueParser, DialogueFormatError 
     34from parpg.dialogueparsers import YamlDialogueParser, DialogueFormatError 
    3535 
    3636try: 
  • branches/active/character_customization/game/parpg/gamescenecontroller.py

    r734 r736  
    2828 
    2929from controllerbase import ControllerBase 
    30 from scripts.gui.hud import Hud 
    31 from scripts.gui import drag_drop_data as data_drag 
     30from parpg.gui.hud import Hud 
     31from parpg.gui import drag_drop_data as data_drag 
    3232from objects.action import ChangeMapAction, ExamineAction, OpenBoxAction, \ 
    3333                           UnlockBoxAction, LockBoxAction, TalkAction, \ 
     
    5454        @type engine: fife.Engine 
    5555        @param view: Instance of a GameSceneView 
    56         @param type: scripts.GameSceneView 
     56        @param type: parpg.GameSceneView 
    5757        @param model: The model that has the current gamestate 
    58         @type model: scripts.GameModel 
     58        @type model: parpg.GameModel 
    5959        @param application: The application that created this controller 
    60         @type application: scripts.PARPGApplication 
     60        @type application: parpg.PARPGApplication 
    6161        @param settings: The current settings of the application 
    6262        @type settings: fife.extensions.fife_settings.Setting 
  • branches/active/character_customization/game/parpg/gamestate.py

    r734 r736  
    1616#   along with PARPG.  If not, see <http://www.gnu.org/licenses/>. 
    1717 
    18 from scripts.quest_engine import QuestEngine 
     18from parpg.quest_engine import QuestEngine 
    1919 
    2020class GameState(object): 
  • branches/active/character_customization/game/parpg/gui/containergui.py

    r734 r736  
    1515from fife.extensions.pychan.tools import callbackWithArguments as cbwa 
    1616 
    17 from scripts.gui.containergui_base import ContainerGUIBase 
    18 from scripts.gui import drag_drop_data as data_drag 
    19 from scripts.objects.base import Container 
     17from parpg.gui.containergui_base import ContainerGUIBase 
     18from parpg.gui import drag_drop_data as data_drag 
     19from parpg.objects.base import Container 
    2020 
    2121class ContainerGUI(ContainerGUIBase): 
  • branches/active/character_customization/game/parpg/gui/containergui_base.py

    r734 r736  
    1717from fife.extensions import pychan 
    1818 
    19 from scripts.gui import drag_drop_data as data_drag 
    20 from scripts.objects.action import ACTIONS 
     19from parpg.gui import drag_drop_data as data_drag 
     20from parpg.objects.action import ACTIONS 
    2121from copy import deepcopy 
    2222 
     
    117117        """Executes the items action 
    118118        @param action: The action to run 
    119         @type action: Class derived from scripts.objects.action.Action 
     119        @type action: Class derived from parpg.objects.action.Action 
    120120        """ 
    121121        action.execute() 
  • branches/active/character_customization/game/parpg/gui/dialoguegui.py

    r734 r736  
    2121from fife.extensions.pychan import widgets 
    2222 
    23 from scripts.dialogueprocessor import DialogueProcessor 
     23from parpg.dialogueprocessor import DialogueProcessor 
    2424 
    2525def setupLogging(): 
  • branches/active/character_customization/game/parpg/gui/hud.py

    r734 r736  
    1919from fife.extensions.pychan.tools import callbackWithArguments as cbwa 
    2020 
    21 from scripts.gui.filebrowser import FileBrowser 
    22 from scripts.gui.context_menu import ContextMenu 
    23 from scripts.gui import inventorygui 
    24 from scripts.gui.popups import ExaminePopup 
    25 from scripts.gui.containergui import ContainerGUI 
    26 from scripts.gui.dialoguegui import DialogueGUI 
    27 from scripts.gui import drag_drop_data as data_drag 
     21from parpg.gui.filebrowser import FileBrowser 
     22from parpg.gui.context_menu import ContextMenu 
     23from parpg.gui import inventorygui 
     24from parpg.gui.popups import ExaminePopup 
     25from parpg.gui.containergui import ContainerGUI 
     26from parpg.gui.dialoguegui import DialogueGUI 
     27from parpg.gui import drag_drop_data as data_drag 
    2828from actionsbox import ActionsBox 
    2929 
  • branches/active/character_customization/game/parpg/gui/inventorygui.py

    r734 r736  
    2020from fife.extensions.pychan.attrs import UnicodeAttr 
    2121 
    22 from scripts.gui import drag_drop_data as data_drag 
    23 from scripts.objects.base import Container 
    24 from scripts.gui.containergui_base import ContainerGUIBase 
    25 from scripts.objects.action import ACTIONS 
     22from parpg.gui import drag_drop_data as data_drag 
     23from parpg.objects.base import Container 
     24from parpg.gui.containergui_base import ContainerGUIBase 
     25from parpg.objects.action import ACTIONS 
    2626 
    2727class EquipmentSlot(pychan.VBox): 
  • branches/active/character_customization/game/parpg/inventory.py

    r734 r736  
    1414# along with PARPG.  If not, see <http://www.gnu.org/licenses/>. 
    1515 
    16 from scripts.objects.base import Container 
    17 from scripts.objects.composed import SingleItemContainer as Slot 
     16from parpg.objects.base import Container 
     17from parpg.objects.composed import SingleItemContainer as Slot 
    1818 
    1919import copy 
  • branches/active/character_customization/game/parpg/mainmenucontroller.py

    r734 r736  
    2424#For debugging/code analysis 
    2525if False: 
    26     from scripts.mainmenuview import MainMenuView 
     26    from parpg.mainmenuview import MainMenuView 
    2727    from fife import fife 
    2828    from gamemodel import GameModel 
  • branches/active/character_customization/game/parpg/mainmenuview.py

    r734 r736  
    1919 
    2020from viewbase import ViewBase 
    21 from scripts.gui.filebrowser import FileBrowser 
     21from parpg.gui.filebrowser import FileBrowser 
    2222 
    2323class MainMenuView(ViewBase): 
  • branches/active/character_customization/game/parpg/objects/action.py

    r734 r736  
    1717#exceptions 
    1818 
    19 from scripts.gui import drag_drop_data as data_drag 
     19from parpg.gui import drag_drop_data as data_drag 
    2020 
    2121class NoSuchQuestException(Exception): 
     
    3232        """Basic action constructor 
    3333        @param controller: A reference to the GameSceneController. 
    34         @type controller: scripts.GameSceneController 
     34        @type controller: parpg.GameSceneController 
    3535        @param commands: Special commands that are executed 
    3636        @type commands: Dictionary  
     
    6565        possibly flagging a new map to be loaded. 
    6666        @param controller: A reference to the GameSceneController. 
    67         @type controller: scripts.GameSceneController 
    68         @param commands: Special commands that are executed 
    69         @type commands: Dictionary  
    70         @type view: class derived from scripts.ViewBase 
     67        @type controller: parpg.GameSceneController 
     68        @param commands: Special commands that are executed 
     69        @type commands: Dictionary  
     70        @type view: class derived from parpg.ViewBase 
    7171        @param view: The view 
    7272        @type target_map_name: String 
     
    9191        """ 
    9292        @param controller: A reference to the GameSceneController. 
    93         @type controller: scripts.GameSceneController 
    94         @param commands: Special commands that are executed 
    95         @type commands: Dictionary  
    96         @type view: class derived from scripts.ViewBase 
     93        @type controller: parpg.GameSceneController 
     94        @param commands: Special commands that are executed 
     95        @type commands: Dictionary  
     96        @type view: class derived from parpg.ViewBase 
    9797        @param view: The view 
    9898        @param container: A reference to the container 
     
    113113        """ 
    114114        @param controller: A reference to the GameSceneController. 
    115         @type controller: scripts.GameSceneController 
    116         @param commands: Special commands that are executed 
    117         @type commands: Dictionary  
    118         @type view: class derived from scripts.ViewBase 
     115        @type controller: parpg.GameSceneController 
     116        @param commands: Special commands that are executed 
     117        @type commands: Dictionary  
     118        @type view: class derived from parpg.ViewBase 
    119119        @param view: The view 
    120120        @param container: A reference to the container 
     
    139139        """ 
    140140        @param controller: A reference to the GameSceneController. 
    141         @type controller: scripts.GameSceneController 
     141        @type controller: parpg.GameSceneController 
    142142        @param commands: Special commands that are executed 
    143143        @type commands: Dictionary  
     
    157157        """ 
    158158        @param controller: A reference to the GameSceneController. 
    159         @type controller: scripts.GameSceneController 
     159        @type controller: parpg.GameSceneController 
    160160        @param commands: Special commands that are executed 
    161161        @type commands: Dictionary  
     
    176176        """ 
    177177        @param controller: A reference to the GameSceneController. 
    178         @type controller: scripts.GameSceneController 
     178        @type controller: parpg.GameSceneController 
    179179        @param examine_id: An object id 
    180180        @type examine_id: integer 
     
    185185        @param commands: Special commands that are executed 
    186186        @type commands: Dictionary  
    187         @type view: class derived from scripts.ViewBase 
     187        @type view: class derived from parpg.ViewBase 
    188188        @param view: The view 
    189189         
     
    214214        """ 
    215215        @param controller: A reference to the GameSceneController. 
    216         @type controller: scripts.GameSceneController 
    217         @param commands: Special commands that are executed 
    218         @type commands: Dictionary  
    219         @type view: class derived from scripts.ViewBase 
     216        @type controller: parpg.GameSceneController 
     217        @param commands: Special commands that are executed 
     218        @type commands: Dictionary  
     219        @type view: class derived from parpg.ViewBase 
    220220        @param view: The view 
    221221        @type examine_name: String 
     
    240240        """ 
    241241        @param controller: A reference to the GameSceneController. 
    242         @type controller: scripts.GameSceneController 
    243         @param commands: Special commands that are executed 
    244         @type commands: Dictionary  
    245         @param view: The view 
    246         @type view: class derived from scripts.ViewBase 
     242        @type controller: parpg.GameSceneController 
     243        @param commands: Special commands that are executed 
     244        @type commands: Dictionary  
     245        @param view: The view 
     246        @type view: class derived from parpg.ViewBase 
    247247        @param text_name: Name of the object containing the text 
    248248        @type text_name: String 
     
    268268        """ 
    269269        @param controller: A reference to the GameSceneController. 
    270         @type controller: scripts.GameSceneController 
    271         @param commands: Special commands that are executed 
    272         @type commands: Dictionary  
    273         @type view: class derived from scripts.ViewBase 
     270        @type controller: parpg.GameSceneController 
     271        @param commands: Special commands that are executed 
     272        @type commands: Dictionary  
     273        @type view: class derived from parpg.ViewBase 
    274274        @param view: The view 
    275275        @type npc: NonPlayerCharacter 
     
    283283        """Talk with the NPC when close enough, otherwise move closer. 
    284284           @return: None""" 
    285         from scripts.dialoguecontroller import DialogueController 
     285        from parpg.dialoguecontroller import DialogueController 
    286286         
    287287        player_char = self.model.game_state.player_character 
     
    328328        """ 
    329329        @param controller: A reference to the GameSceneController. 
    330         @type controller: scripts.GameSceneController 
     330        @type controller: parpg.GameSceneController 
    331331        @param item: Item on which the action is called 
    332332        @type item: CarryableItem 
  • branches/active/character_customization/game/parpg/objects/actors.py

    r734 r736  
    2323from base import GameObject, Living, Scriptable, CharStats 
    2424from composed import CarryableItem 
    25 from scripts.inventory import Inventory 
    26 from scripts.common.utils import loadSettings 
     25from parpg.inventory import Inventory 
     26from parpg.common.utils import loadSettings 
    2727 
    2828"""All actors go here. Concrete classes only.""" 
  • branches/active/character_customization/game/parpg/objects/base.py

    r734 r736  
    177177 
    178178class Scriptable (BaseObject): 
    179     """Allows objects to have predefined scripts executed on certain events""" 
    180     def __init__ (self, scripts = None, **kwargs): 
     179    """Allows objects to have predefined parpg executed on certain events""" 
     180    def __init__ (self, parpg = None, **kwargs): 
    181181        """Init operation for scriptable objects 
    182            @type scripts: Dictionary 
    183            @param scripts: Dictionary where the event strings are keys. The  
     182           @type parpg: Dictionary 
     183           @param parpg: Dictionary where the event strings are keys. The  
    184184           values are 3-item tuples (function, positional_args, keyword_args)""" 
    185185        BaseObject.__init__(self) 
    186186        self.attributes.append("scriptable") 
    187         self.scripts = scripts or {} 
     187        self.parpg = parpg or {} 
    188188         
    189189    def runScript (self, event): 
    190190        """Runs the script for the given event""" 
    191         if event in self.scripts and self.scripts[event]: 
    192             func, args, kwargs = self.scripts[event] 
     191        if event in self.parpg and self.parpg[event]: 
     192            func, args, kwargs = self.parpg[event] 
    193193            func (*args, **kwargs) 
    194194             
     
    197197        args = args or {} 
    198198        kwargs = kwargs or {} 
    199         self.scripts[event] = (func, args, kwargs) 
     199        self.parpg[event] = (func, args, kwargs) 
    200200 
    201201class Openable(DynamicObject, Scriptable): 
     
    323323            self.items[index] = item 
    324324 
    325         # Run any scripts associated with storing an item in the container 
     325        # Run any parpg associated with storing an item in the container 
    326326        try: 
    327327            if self.trueAttr ('scriptable'): 
     
    347347        del self.items[self.items.keys()[self.items.values().index(item)]] 
    348348 
    349         # Run any scripts associated with popping an item out of the container 
     349        # Run any parpg associated with popping an item out of the container 
    350350        try: 
    351351            if self.trueAttr ('scriptable'): 
     
    375375        del self.items[self.items.keys()[self.items.values().index(item)]] 
    376376 
    377         # Run any scripts associated with popping an item out of the container 
     377        # Run any parpg associated with popping an item out of the container 
    378378        try: 
    379379            if self.trueAttr ('scriptable'): 
  • branches/active/character_customization/game/parpg/quest_engine.py

    r734 r736  
    1717 
    1818import yaml 
    19 from scripts.common.utils import locateFiles 
     19from parpg.common.utils import locateFiles 
    2020import os.path 
    2121 
  • branches/active/character_customization/game/run.py

    r674 r736  
    3939======================================================================" 
    4040 
    41 from scripts.parpg import PARPGApplication 
    42 from scripts.common.utils import loadSettings 
     41from parpg.application import PARPGApplication 
     42from parpg.common.utils import loadSettings 
    4343 
    44 from scripts.common import utils 
     44from parpg.common import utils 
    4545 
    4646# add paths to the swig extensions 
     
    5252   minimal, since folding code into the controller with MVC is usually bad 
    5353   All game and logic and data is held held and referenced in  
    54    /scripts/engine.py. All fife stuff goes in /scripts/world.py""" 
     54   /parpg/engine.py. All fife stuff goes in /parpg/world.py""" 
    5555 
    5656def main_is_frozen(): 
  • branches/active/character_customization/game/tests/test_carryable_container.py

    r653 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import GameObject, Carryable 
    20 from scripts.objects.composed import CarryableContainer 
     19from parpg.objects.base import GameObject, Carryable 
     20from parpg.objects.composed import CarryableContainer 
    2121 
    2222class  TestCarryableContainer(unittest.TestCase): 
  • branches/active/character_customization/game/tests/test_console.py

    r584 r736  
    1818 
    1919import unittest 
    20 from scripts.console import Console 
     20from parpg.console import Console 
    2121 
    2222class test_console(unittest.TestCase): 
  • branches/active/character_customization/game/tests/test_container.py

    r584 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import GameObject, Container, Scriptable, Carryable 
     19from parpg.objects.base import GameObject, Container, Scriptable, Carryable 
    2020 
    2121class  TestContainer(unittest.TestCase): 
     
    7979 
    8080    def testScripting(self): 
    81         container = self.ScriptableContainer(5,scripts={'onPlaceItem':(self.onPlaceItem,(),{}),'onTakeItem':(self.onTakeItem,(),{})}) 
     81        container = self.ScriptableContainer(5,parpg={'onPlaceItem':(self.onPlaceItem,(),{}),'onTakeItem':(self.onTakeItem,(),{})}) 
    8282        self.assertFalse(self.ranOnPlaceItem) 
    8383        self.assertFalse(self.ranOnTakeItem) 
  • branches/active/character_customization/game/tests/test_crate.py

    r584 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.containers import WoodenCrate 
     19from parpg.objects.containers import WoodenCrate 
    2020 
    2121class TestWoodenCrate(unittest.TestCase): 
     
    3535        self.assertEqual(self.crate.is_open, True) 
    3636        self.assertEqual(self.crate.locked, False) 
    37         self.assertEqual(self.crate.scripts, {}) 
     37        self.assertEqual(self.crate.parpg, {}) 
    3838 
    3939        self.assertEqual(self.crate2.ID, 'crate02') 
  • branches/active/character_customization/game/tests/test_dialogueprocessor.py

    r707 r736  
    2222    import unittest 
    2323 
    24 from scripts.common.utils import dedent_chomp 
    25 from scripts.dialogueprocessor import DialogueProcessor 
     24from parpg.common.utils import dedent_chomp 
     25from parpg.dialogueprocessor import DialogueProcessor 
    2626# NOTE Technomage 2010-12-08: Using the dialogue data structures might be a 
    2727#    violation of unit test isolation, but ultimately they are just simple 
    2828#    data structures that don't require much testing of their own so I feel 
    2929#    that it isn't a mistake to use them. 
    30 from scripts.dialogue import (Dialogue, DialogueSection, DialogueResponse, 
     30from parpg.dialogue import (Dialogue, DialogueSection, DialogueResponse, 
    3131    DialogueGreeting) 
    3232 
  • branches/active/character_customization/game/tests/test_game_object.py

    r584 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import GameObject 
     19from parpg.objects.base import GameObject 
    2020 
    2121class TestGameObject(unittest.TestCase): 
  • branches/active/character_customization/game/tests/test_inventory.py

    r653 r736  
    1717 
    1818import unittest 
    19 from scripts.inventory import Inventory 
    20 from scripts.objects.base import GameObject, Carryable 
     19from parpg.inventory import Inventory 
     20from parpg.objects.base import GameObject, Carryable 
    2121 
    2222class  TestInventory(unittest.TestCase): 
  • branches/active/character_customization/game/tests/test_living.py

    r611 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import Living 
     19from parpg.objects.base import Living 
    2020 
    2121class  TestLiving(unittest.TestCase): 
  • branches/active/character_customization/game/tests/test_lockable.py

    r584 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import Lockable, GameObject 
     19from parpg.objects.base import Lockable, GameObject 
    2020 
    2121 
  • branches/active/character_customization/game/tests/test_npc.py

    r653 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.actors import NonPlayerCharacter 
     19from parpg.objects.actors import NonPlayerCharacter 
    2020 
    2121class MockLayer(object): 
  • branches/active/character_customization/game/tests/test_objects_base.py

    r611 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import GameObject, Lockable, Container, Living, \ 
     19from parpg.objects.base import GameObject, Lockable, Container, Living, \ 
    2020                            Scriptable, CharStats, Wearable, Usable, Weapon, \ 
    2121                            Destructable, Trapable, Carryable 
  • branches/active/character_customization/game/tests/test_openable.py

    r584 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import Scriptable, Openable, GameObject 
     19from parpg.objects.base import Scriptable, Openable, GameObject 
    2020 
    2121 
     
    6666        """ Test Openable mixin with scripting""" 
    6767 
    68         self.openable = self.OpenableScriptable(3, scripts={'onOpen':(self.onOpen,(),{}),'onClose':(self.onClose,(),{})}) 
     68        self.openable = self.OpenableScriptable(3, parpg={'onOpen':(self.onOpen,(),{}),'onClose':(self.onClose,(),{})}) 
    6969        self.assertEqual(self.ran_on_close,False) 
    7070        self.assertEqual(self.ran_on_open,False) 
  • branches/active/character_customization/game/tests/test_scriptable.py

    r584 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import GameObject, Scriptable 
     19from parpg.objects.base import GameObject, Scriptable 
    2020 
    2121class  TestScriptable(unittest.TestCase): 
  • branches/active/character_customization/game/tests/test_single_item_container.py

    r653 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import GameObject, Carryable 
    20 from scripts.objects.composed import SingleItemContainer 
     19from parpg.objects.base import GameObject, Carryable 
     20from parpg.objects.composed import SingleItemContainer 
    2121 
    2222class  TestSingleItemContainer(unittest.TestCase): 
  • branches/active/character_customization/game/tests/test_wearable.py

    r653 r736  
    1717 
    1818import unittest 
    19 from scripts.objects.base import Wearable 
     19from parpg.objects.base import Wearable 
    2020 
    2121class  TestWearable(unittest.TestCase): 
  • branches/active/character_customization/game/utilities/convert_dialogue.py

    r668 r736  
    1212import logging 
    1313 
    14 from scripts.common.optionparser import OptionParser 
    15 from scripts.dialogueparser import (OldYamlDialogueParser, YamlDialogueParser, 
     14from parpg.common.optionparser import OptionParser 
     15from parpg.dialogueparser import (OldYamlDialogueParser, YamlDialogueParser, 
    1616    DialogueFormatError) 
    1717 
  • branches/active/character_customization/game/utilities/dialogueChecker.py

    r653 r736  
    2020 
    2121import sys 
    22 sys.path = ['../scripts'] + sys.path 
     22sys.path = ['../parpg'] + sys.path 
    2323 
    2424 
  • branches/active/character_customization/tools/pychan_designer/fonts/freefont/COPYING

    r716 r736  
    134134  The "Corresponding Source" for a work in object code form means all 
    135135the source code needed to generate, install, and (for an executable 
    136 work) run the object code and to modify the work, including scripts to 
     136work) run the object code and to modify the work, including parpg to 
    137137control those activities.  However, it does not include the work's 
    138138System Libraries, or general-purpose tools or generally available free 
  • branches/active/character_customization/tools/pychan_designer/fonts/freefont/CREDITS

    r716 r736  
    6666 
    6767Between April 1990 and March 1992, Wadalab Kanji Comittee put together 
    68 a series of scalable font files with Japanese scripts, in four forms: 
     68a series of scalable font files with Japanese parpg, in four forms: 
    6969Sai Micho, Chu Mincho, Cho Kaku and Saimaru. The font files are 
    7070written in custom file format, while tools for conversion into 
     
    329329M/S Cyberscape Multimedia Limited, Mumbai, developers of Akruti 
    330330Software for Indian Languages (http://www.akruti.com/), have released 
    331 a set of TTF fonts for nine Indian scripts (Devanagari, Gujarati, 
     331a set of TTF fonts for nine Indian parpg (Devanagari, Gujarati, 
    332332Telugu, Tamil, Malayalam, Kannada, Bengali, Oriya, and Gurumukhi) 
    333333under the GNU General Public License (GPL). You can download the fonts 
     
    502502* George Douros 
    503503 
    504 The creator of several fonts focusing on ancient scripts and symbols. 
     504The creator of several fonts focusing on ancient parpg and symbols. 
    505505Many of the glyphs are created by making outlines from scanned images 
    506506of ancient sources. 
  • branches/active/character_customization/tools/pychan_designer/fonts/freefont/ChangeLog

    r716 r736  
    613613        * FreeSerifItalic.sfd: 
    614614 
    615         Changed lookup table scripts for Devanagari and Bengali. 
     615        Changed lookup table parpg for Devanagari and Bengali. 
    616616        Find Problems -> ATT found several problems showing lookups acting on 
    617617        glyphs that weren't listed in the script ranges, including dev2, bng2 
     
    619619         
    620620        danda and doubledanda of Devanagari I understand are to be shared among 
    621         Indic scripts.  So included bng2 and dev2 in the 'aalt' table for those. 
     621        Indic parpg.  So included bng2 and dev2 in the 'aalt' table for those. 
    622622         
    623623        The 'init' and 'half' tables for Bengali made active for bng2. 
     
    838838        * FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd: 
    839839 
    840         Added some Superscripts and Subscripts 
     840        Added some Superparpg and Subparpg 
    841841 
    842842        * FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd: 
    843843 
    844         Finished off Superscripts and subscripts 
     844        Finished off Superparpg and subparpg 
    845845 
    846846        Completed General Punctuation for Mono faces 
     
    14321432        Unicode ranges) into the Private Use area. 
    14331433         
    1434         In Serif, I segregated the scripts, in Sans it was hard to see where one 
     1434        In Serif, I segregated the parpg, in Sans it was hard to see where one 
    14351435        began and another ended, so I moved them en masse. 
    14361436         
     
    14411441        * FreeSansBold.sfd, FreeSansOblique.sfd: 
    14421442 
    1443         Fixed (I hope the last) problem with scripts in lookups 
     1443        Fixed (I hope the last) problem with parpg in lookups 
    14441444        Find Problems -> ATT (all selected) finds multiple issues, 
    14451445         
    14461446        * FreeSansBold.sfd: 
    1447         In addition to script 'guru', added 'gur2' to the scripts for these 
     1447        In addition to script 'guru', added 'gur2' to the parpg for these 
    14481448        lookups 
    14491449                'nukt' Nukta forms in Gurmukhi 
     
    14551455         
    14561456        * FreeSansOblique.sfd: 
    1457         In addition to script 'beng', added 'bng2' to the scripts for the lookup 
     1457        In addition to script 'beng', added 'bng2' to the parpg for the lookup 
    14581458                'half' Half Forms in Bengali 
    14591459         
     
    14611461                'aalt' Access All Alternates in Latin 
    14621462        contains only Bengali letters. 
    1463         Re-named as Bengali, made to work on beng, bng2 scripts 
     1463        Re-named as Bengali, made to work on beng, bng2 parpg 
    14641464 
    146514652008-06-20 Steve White 
     
    18781878 
    18791879        Deleted ranges for Oriya, Kannada, on account of 
    1880         1) they only contained a subset of the consonant glyphs of the scripts, 
     1880        1) they only contained a subset of the consonant glyphs of the parpg, 
    18811881           few if any vowels, and had no ligature lookups as required 
    18821882        2) Kannada was based on the Akurti fonts, which have copyright issues. 
     
    19821982        * FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd: 
    19831983 
    1984         More work on Superscripts and Subscripts, Spacing Modifiers. 
     1984        More work on Superparpg and Subparpg, Spacing Modifiers. 
    19851985        Sans is now complete in both. 
    19861986        Added Pfennig to Sans and Mono. 
     
    26582658        A previous commit had added lookups that referred to these, 
    26592659 
    2660         More fiddling with super/subscripts 
     2660        More fiddling with super/subparpg 
    26612661 
    26622662        * Makefile, Makefile, GenerateTrueType: 
     
    27742774        # A couple of Indic lookups had incorrect script DFLT; one had 'latn'. 
    27752775 
    2776         # Don't understand why there are scripts named 
     2776        # Don't understand why there are parpg named 
    27772777                dev2 bng2 grj2 gur2 when there are already deva beng gurj guru 
    27782778          But anyway, lots of 'vatu' 'pres' 'haln' and 'liga' lookups contained 
    2779           characters in the '2' scripts but were lablled only for the 'non-2'  
    2780           ones.  Added the '2' scripts to all these lookups. Suspect a mistake. 
     2779          characters in the '2' parpg but were lablled only for the 'non-2'  
     2780          ones.  Added the '2' parpg to all these lookups. Suspect a mistake. 
    27812781 
    27822782        Note: several of these problems are repeated in other Sans faces. 
     
    29932993        * sfd/*.sfd: started removing glyphs with back layers (printing bug) 
    29942994        * sfd/*.sfd: adjusted vulgar fractions (bug #17756) 
    2995         * sfd/*.sfd: adjusted numerical superscripts (bug #20278) 
     2995        * sfd/*.sfd: adjusted numerical superparpg (bug #20278) 
    29962996 
    299729972008-02-18  Steve White 
     
    36873687        (U+2070-2079). 
    36883688 
    3689         * sfd/FreeSansBold.sfd - added subscripts and superscripts 
     3689        * sfd/FreeSansBold.sfd - added subparpg and superparpg 
    36903690        (U+2070-208F), completed fractions (U+2152-215F) and Roman 
    36913691        numerals (U+2160-217F). 
     
    39173917 
    39183918        * sfd/FreeSerifBold.sfd, sfd/FreeSerifItalic.sfd - Started working 
    3919         on super- and subscripts.  
     3919        on super- and subparpg.  
    39203920 
    392139212003-09-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si> 
     
    39263926        * sfd/FreeSansBold.sfd - Cleared background characters in Latin 
    39273927        Extended-A. Added some automatically constructed characters in 
    3928         Latin Extended-B. Started with superscripts and subscripts. 
     3928        Latin Extended-B. Started with superparpg and subparpg. 
    39293929 
    39303930        * sfd/FreeSans.sfd - Subscript numerals (U+2080-U+2089) completed. 
     
    39653965 
    39663966        * sfd/FreeSerif.sfd - Clean-up of the Cyrillic letters added on 
    3967         March 27; super- and subscripts, vulgar fractions. 
     3967        March 27; super- and subparpg, vulgar fractions. 
    39683968 
    396939692003-05-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si> 
     
    42914291        Miscellaneous Symbols area. 
    42924292 
    4293         * sfd/FreeMonoBoldOblique.sfd - Added subscripts, superscripts and 
     4293        * sfd/FreeMonoBoldOblique.sfd - Added subparpg, superparpg and 
    42944294        vulgar fractions. 
    42954295 
     
    42974297        Latin and Cyrillic. 
    42984298 
    4299         * sfd/FreeMonoBold.sfd - Added subscripts, superscripts and vulgar 
     4299        * sfd/FreeMonoBold.sfd - Added subparpg, superparpg and vulgar 
    43004300        fractions. 
    43014301 
    430243022002-04-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si> 
    43034303 
    4304         * www/design-notes.html - Updated notes on super-/subscripts in 
     4304        * www/design-notes.html - Updated notes on super-/subparpg in 
    43054305        Free Mono Bold. Separate subsections for Free Mono regular and 
    43064306        Free Mono Bold. 
  • branches/active/character_customization/tools/pychan_designer/fonts/freefont/README

    r716 r736  
    4444Which font shapes should be made?  Historical style terms like Renaissance 
    4545or Baroque letterforms cannot be applied beyond Latin/Cyrillic/Greek 
    46 scripts to any greater extent than Kufi or Nashki can be applied beyond 
     46parpg to any greater extent than Kufi or Nashki can be applied beyond 
    4747Arabic script; "italic" is really only meaningful for Latin letters.  
    4848 
  • branches/active/character_customization/tools/pychan_designer/pychan_designer.py

    r716 r736  
    1212from fife.extensions import pychan 
    1313 
    14 from scripts.common.optionparser import OptionParser, OptionError 
    15 from scripts.common.utils import dedent_chomp 
    16 from scripts import gui 
     14from parpg.common.optionparser import OptionParser, OptionError 
     15from parpg.common.utils import dedent_chomp 
     16from parpg import gui 
    1717 
    1818USAGE_MESSAGE = '''\ 
  • branches/active/character_customization/tools/writing_editor/data/recent_files.txt

    r217 r736  
    1 /home/brett/fife/clients/writingEditor/scripts/writingEditor.py 
     1/home/brett/fife/clients/writingEditor/parpg/writingEditor.py 
  • branches/active/character_customization/tools/writing_editor/run.py

    r584 r736  
    1919 
    2020from PyQt4 import QtCore, QtGui 
    21 from scripts.writingEditor import WritingEditor 
     21from parpg.writingEditor import WritingEditor 
    2222 
    2323def createApplication(): 
  • branches/active/character_customization/tools/writing_editor/scripts/dialogMap.py

    r584 r736  
    1717 
    1818from PyQt4 import QtGui, QtCore 
    19 from scripts.parser import parse 
     19from parpg.parser import parse 
    2020 
    2121class DialogScene(object): 
  • branches/active/character_customization/tools/writing_editor/scripts/writingEditor.py

    r584 r736  
    2121from ui.editor_ui import Ui_writingEditor 
    2222from ui.popupWindows import * 
    23 from scripts.syntaxHighlight import SyntaxHighlighter 
    24 from scripts.settings import Settings 
    25 from scripts.dialogMap import DialogMap 
    26 from scripts.parser import parse 
     23from parpg.syntaxHighlight import SyntaxHighlighter 
     24from parpg.settings import Settings 
     25from parpg.dialogMap import DialogMap 
     26from parpg.parser import parse 
    2727 
    2828 
  • branches/active/character_customization/tools/writing_editor/ui/popupWindows.py

    r584 r736  
    1717 
    1818from PyQt4 import QtGui, QtCore 
    19 from scripts.syntaxHighlight import SyntaxHighlighter 
     19from parpg.syntaxHighlight import SyntaxHighlighter 
    2020 
    2121class AboutWindow(QtGui.QMainWindow): 
     
    9898        @type parent: QtGui.QWidget? 
    9999        @param parent: the parent widget 
    100         @type settings: scripts.settings.Settings 
     100        @type settings: parpg.settings.Settings 
    101101        @param settings: the settings for the application 
    102102        """ 
Note: See TracChangeset for help on using the changeset viewer.