Changeset 324


Ignore:
Timestamp:
10/14/09 18:20:57 (10 years ago)
Author:
orlandov
Message:

Ticket #93: Patch by or1andov. Use the name attribute for on mouse over text. fixes[s:trac, t:93]

Location:
trunk/game
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/game/maps/map.xml

    r320 r324  
    19471947      <i x="0.0" o="player" z="0.0" y="0.0" r="0" id="PC" object_type="PlayerCharacter"/> 
    19481948      <!-- There can be any number of NPC characters --> 
    1949       <i x="-5.0" o="long_coat_female" z="0.0" y="-3.0" r="0" id="long_coat_female0" object_type="NonPlayerCharacter" text="A woman wearing a large coat"/> 
    1950       <i x="-5.0" o="long_coat_male" z="0.0" y="-4.0" r="0" id="long_coat_male0" object_type="NonPlayerCharacter" text="A man wearing a large coat"/> 
    1951       <i x="-5.0" o="male_farmer_1" z="0.0" y="-5.0" r="0" dialogue="dialogue/farmer.yaml" id="male_farmer0" object_type="NonPlayerCharacter" text="A grimy looking farmer"/> 
    1952       <i x="-5.0" o="male_traveler_1" z="0.0" y="-6.0" r="0" id="male_traveler0" object_type="NonPlayerCharacter" text="A wandering traveler"/> 
    1953       <i x="-5.0" o="npc_woman" z="0.0" y="-7.0" r="0" id="woman01" dialogue="dialogue/sample.yaml" object_type="NonPlayerCharacter" text="A friendly woman"/> 
     1949      <i x="-5.0" o="long_coat_female" z="0.0" y="-3.0" r="0"  name="Aeon" id="long_coat_female0" object_type="NonPlayerCharacter" text="A woman wearing a large coat"/> 
     1950      <i x="-5.0" o="long_coat_male" z="0.0" y="-4.0" r="0" name="The Judge" id="long_coat_male0" object_type="NonPlayerCharacter" text="A man wearing a large coat"/> 
     1951      <i x="-5.0" o="male_farmer_1" z="0.0" y="-5.0" r="0" name="Manslow" dialogue="dialogue/farmer.yaml" id="male_farmer0" object_type="NonPlayerCharacter" text="A grimy looking farmer"/> 
     1952      <i x="-5.0" o="male_traveler_1" z="0.0" y="-6.0" r="0" name="Gregor" id="male_traveler0" object_type="NonPlayerCharacter" text="A wandering traveler"/> 
     1953      <i x="-5.0" o="npc_woman" z="0.0" y="-7.0" r="0" name="Loranda" id="woman01" dialogue="dialogue/sample.yaml" object_type="NonPlayerCharacter" text="A friendly woman"/> 
    19541954      <i x="-3.0" o="crate" z="0.0" y="-4.0" r="0" id="crate01" object_type="WoodenCrate" is_open="False" locked="False" name="asdf" text="A crate that is covered in grime and dirt. There doesn't seem to be anything remarkable about it"/> 
    19551955      <!-- There can be any number of objects --> 
  • trunk/game/scripts/objects/actors.py

    r323 r324  
    236236    NPC class 
    237237    """ 
    238     def __init__(self, ID, agent_layer = None, name = 'NPC', \ 
     238    def __init__(self, ID, agent_layer=None, name='NPC', \ 
    239239                 text = 'A nonplayer character', **kwargs): 
    240240        # init game object 
    241         GameObject.__init__( self, ID, **kwargs ) 
    242         Living.__init__( self, **kwargs ) 
    243         Scriptable.__init__( self, **kwargs ) 
    244         CharStats.__init__( self, **kwargs ) 
     241        GameObject.__init__(self, ID, name=name, **kwargs) 
     242        Living.__init__(self, **kwargs) 
     243        Scriptable.__init__(self, **kwargs) 
     244        CharStats.__init__(self, **kwargs) 
    245245 
    246246        self.is_NPC = True 
Note: See TracChangeset for help on using the changeset viewer.