Changeset 539


Ignore:
Timestamp:
04/22/10 10:53:47 (10 years ago)
Author:
beliar
Message:
  • Added the shanty door to the database
  • Removed redundant information from the maps
  • Changed the text of the door in map2.xml
Location:
trunk/game
Files:
4 edited

Legend:

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

    r465 r539  
    53565356                        <i o="guard_tower" r="315" x="4.0" y="-17.0" z="0.0" /> 
    53575357                        <i id="PC" is_open="None" locked="None" name="None" o="player" object_type="PlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="None" x="2.0" y="-8.0" z="0.0" /> 
    5358                         <i id="shanty-door01" is_open="False" locked="None" name="Shanty Door" o="shanty-door" object_type="ShantyDoor" r="0" target_map="maps/map2.xml" target_map_name="map2" target_x="10.0" target_y="10.0" text="Looks like the entrance to the building." x="-6.0" y="-13.0" z="0.0" /> 
     5358                        <i id="shanty-door01" is_open="False" locked="None" o="shanty-door" object_type="ShantyDoor" r="0" target_map="maps/map2.xml" target_map_name="map2" target_x="10.0" target_y="10.0" x="-6.0" y="-13.0" z="0.0" /> 
    53595359                        <i o="container_house01" r="0" x="-1.0" y="2.0" z="0.0" /> 
    53605360                        <i o="container_house02" r="0" x="14.0" y="4.0" z="0.0" /> 
     
    54705470                        <i o="block" r="0" x="5.0" y="-20.0" z="0.0" /> 
    54715471                        <i o="block" r="0" x="6.0" y="-20.0" z="0.0" /> 
    5472                         <i id="lock_box01" is_open="False" locked="False" name="Footlocker" o="lock_box_metal01" object_type="Footlocker" r="225" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A footlocker. There doesn&apos;t seem to be anything remarkable about it" x="-9.0" y="0.0" z="0.0" /> 
     5472                        <i id="lock_box01" is_open="False" locked="False" o="lock_box_metal01" object_type="Footlocker" r="225" target_map="None" target_map_name="None" target_x="None" target_y="None" x="-9.0" y="0.0" z="0.0" /> 
    54735473                        <i o="pillar1_segment0" r="0" x="-35.0" y="-60.0" z="0.0" /> 
    54745474                        <i o="pillar1_segment1" r="0" x="-33.0" y="-60.0" z="0.0" /> 
  • trunk/game/maps/map2.xml

    r510 r539  
    10131013                        <i dialogue="dialogue/farm_boy1.yaml" id="farm_boy0" is_open="None" locked="None" name="Sami"    o="long_coat_male" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="An earstwhile boy, working hard" x="3.0" y="4.0" z="0.0" /> 
    10141014                        <i dialogue="dialogue/farm_boy2.yaml" id="farm_boy1" is_open="None" locked="None" name="Rasmus"  o="long_coat_male" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A grimy looking farmer" x="4.0" y="3.0" z="0.0" /> 
    1015                         <i id="shanty-door01" is_open="False" locked="None" name="Shanty Door" o="shanty-door" object_type="ShantyDoor" r="0" target_map="maps/map.xml" target_map_name="main-map" target_x="5.0" target_y="5.0" text="Looks like the entrance to the building." x="-2.0" y="6.0" z="0.0" /> 
     1015                        <i id="shanty-door01" is_open="False" locked="None" o="shanty-door" object_type="ShantyDoor" r="0" target_map="maps/map.xml" target_map_name="main-map" target_x="5.0" target_y="5.0" text="Looks like the exit of the building." x="-2.0" y="6.0" z="0.0" /> 
    10161016                </instances> 
    10171017        </layer> 
  • trunk/game/objects/ObjectDatabase.yaml

    r537 r539  
    88  text: A battered crate 
    99  gfx: crate 
     10   
     11ShantyDoor: 
     12  name: "Shanty Door" 
     13  text: "Looks like the entrance to the building." 
     14  gfx: "shanty-door" 
  • trunk/game/scripts/objects/containers.py

    r529 r539  
    5454         
    5555    def onInstanceActionFinished(self, instance, action): 
    56         """What the NPC does when it has finished an action. 
     56        """What the Actor does when it has finished an action. 
    5757           Called by the engine and required for InstanceActionListeners. 
    5858           @type instance: fife.Instance 
    59            @param instance: self.agent (the NPC listener is listening for this 
     59           @param instance: self.agent (the Actor listener is listening for this 
    6060            instance) 
    6161           @type action: ??? 
Note: See TracChangeset for help on using the changeset viewer.