Changeset 225


Ignore:
Timestamp:
08/06/09 23:17:27 (10 years ago)
Author:
bretzel_parpg
Message:

Objects now use name and text without desc. Fixes #69.

Location:
trunk/PARPG
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/PARPG/maps/map_objects.xml

    r190 r225  
    1414    <!-- Object blocking is set in the objects own xml file --> 
    1515    <object type="WoodenCrate" xpos="-4.0" ypos="-6.0" id="crate02" 
    16             is_open="False" locked="False" text="A dirty old crate" 
    17             desc="A crate that is covered in grime and dirt. There doesn't seem to be anything remarkable about it"></object> 
     16            is_open="False" locked="False" name="A dirty old crate" 
     17            text="A crate that is covered in grime and dirt. There doesn't seem to be anything remarkable about it"></object> 
    1818                         
    1919        <object type="WoodenCrate" id="crate01" xpos="-3.0" ypos="-4.0"  
    20                 is_open="False" locked="False" text="asdf" 
    21                 desc="A crate that is covered in grime and dirt. There doesn't seem to be anything remarkable about it"></object> 
     20                is_open="False" locked="False" name="asdf" 
     21                text="A crate that is covered in grime and dirt. There doesn't seem to be anything remarkable about it"></object> 
    2222 
    2323    <!-- There can be a number of doors, which serve as transition triggers --> 
  • trunk/PARPG/scripts/engine.py

    r212 r225  
    100100        f.close() 
    101101        if self.gameState.currentMap: 
    102             self.loadMap(self.gameState.currentMap) 
     102            self.loadMap(self.gameState.currentMap)  
    103103 
    104104    def loadObjects(self, filename): 
     
    232232            else: 
    233233                actions.append(["Examine", "Examine", self.gameState.PC.approach,   
    234                                 [obj.X, obj.Y], ExamineBoxAction(self, obj.name, obj.desc)]) 
     234                                [obj.X, obj.Y], ExamineBoxAction(self, obj.name, obj.text)]) 
    235235                # is it a container? 
    236236                if obj.trueAttr("container"): 
  • trunk/PARPG/scripts/world.py

    r221 r225  
    338338                    item = self.data.objectActive(obj.getId()) 
    339339                    if(item): 
    340                         self.displayObjectText(obj, item.text) 
     340                        self.displayObjectText(obj, item.name) 
    341341        else: 
    342342            # erase the outline 
Note: See TracChangeset for help on using the changeset viewer.