Changeset 365 for trunk/game


Ignore:
Timestamp:
11/02/09 22:06:08 (10 years ago)
Author:
barra_parpg
Message:

Patch by mvbarracuda:

  • Fix agentXmlGen.py: xoff >> x_off
  • Corrected y shift for player character for better collision detection
Location:
trunk/game
Files:
41 edited

Legend:

Unmodified
Added
Removed
  • trunk/game/objects/agents/player/pick_up/000/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:pick_up:000" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:pick_up:000" x_offset="0" y_offset="-25"> 
    22        <frame source="pick_up_0.png" /> 
    33        <frame source="pick_up_1.png" /> 
  • trunk/game/objects/agents/player/pick_up/045/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:pick_up:045" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:pick_up:045" x_offset="0" y_offset="-25"> 
    22        <frame source="pick_up_0.png" /> 
    33        <frame source="pick_up_1.png" /> 
  • trunk/game/objects/agents/player/pick_up/090/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:pick_up:090" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:pick_up:090" x_offset="0" y_offset="-25"> 
    22        <frame source="pick_up_0.png" /> 
    33        <frame source="pick_up_1.png" /> 
  • trunk/game/objects/agents/player/pick_up/135/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:pick_up:135" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:pick_up:135" x_offset="0" y_offset="-25"> 
    22        <frame source="pick_up_0.png" /> 
    33        <frame source="pick_up_1.png" /> 
  • trunk/game/objects/agents/player/pick_up/180/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:pick_up:180" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:pick_up:180" x_offset="0" y_offset="-25"> 
    22        <frame source="pick_up_0.png" /> 
    33        <frame source="pick_up_1.png" /> 
  • trunk/game/objects/agents/player/pick_up/225/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:pick_up:225" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:pick_up:225" x_offset="0" y_offset="-25"> 
    22        <frame source="pick_up_0.png" /> 
    33        <frame source="pick_up_1.png" /> 
  • trunk/game/objects/agents/player/pick_up/270/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:pick_up:270" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:pick_up:270" x_offset="0" y_offset="-25"> 
    22        <frame source="pick_up_0.png" /> 
    33        <frame source="pick_up_1.png" /> 
  • trunk/game/objects/agents/player/pick_up/315/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:pick_up:315" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:pick_up:315" x_offset="0" y_offset="-25"> 
    22        <frame source="pick_up_0.png" /> 
    33        <frame source="pick_up_1.png" /> 
  • trunk/game/objects/agents/player/run/000/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:run:000" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:run:000" x_offset="0" y_offset="-25"> 
    22        <frame source="run_0.png" /> 
    33        <frame source="run_1.png" /> 
  • trunk/game/objects/agents/player/run/045/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:run:045" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:run:045" x_offset="0" y_offset="-25"> 
    22        <frame source="run_0.png" /> 
    33        <frame source="run_1.png" /> 
  • trunk/game/objects/agents/player/run/090/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:run:090" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:run:090" x_offset="0" y_offset="-25"> 
    22        <frame source="run_0.png" /> 
    33        <frame source="run_1.png" /> 
  • trunk/game/objects/agents/player/run/135/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:run:135" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:run:135" x_offset="0" y_offset="-25"> 
    22        <frame source="run_0.png" /> 
    33        <frame source="run_1.png" /> 
  • trunk/game/objects/agents/player/run/180/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:run:180" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:run:180" x_offset="0" y_offset="-25"> 
    22        <frame source="run_0.png" /> 
    33        <frame source="run_1.png" /> 
  • trunk/game/objects/agents/player/run/225/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:run:225" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:run:225" x_offset="0" y_offset="-25"> 
    22        <frame source="run_0.png" /> 
    33        <frame source="run_1.png" /> 
  • trunk/game/objects/agents/player/run/270/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:run:270" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:run:270" x_offset="0" y_offset="-25"> 
    22        <frame source="run_0.png" /> 
    33        <frame source="run_1.png" /> 
  • trunk/game/objects/agents/player/run/315/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:run:315" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:run:315" x_offset="0" y_offset="-25"> 
    22        <frame source="run_0.png" /> 
    33        <frame source="run_1.png" /> 
  • trunk/game/objects/agents/player/stand/000/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:stand:000" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:000" x_offset="0" y_offset="-25"> 
    22        <frame source="stand_0.png" /> 
    33        <frame source="stand_1.png" /> 
  • trunk/game/objects/agents/player/stand/045/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:stand:045" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:045" x_offset="0" y_offset="-25"> 
    22        <frame source="stand_0.png" /> 
    33        <frame source="stand_1.png" /> 
  • trunk/game/objects/agents/player/stand/090/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:stand:090" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:090" x_offset="0" y_offset="-25"> 
    22        <frame source="stand_0.png" /> 
    33        <frame source="stand_1.png" /> 
  • trunk/game/objects/agents/player/stand/135/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:stand:135" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:135" x_offset="0" y_offset="-25"> 
    22        <frame source="stand_0.png" /> 
    33        <frame source="stand_1.png" /> 
  • trunk/game/objects/agents/player/stand/180/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:stand:180" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:180" x_offset="0" y_offset="-25"> 
    22        <frame source="stand_0.png" /> 
    33        <frame source="stand_1.png" /> 
  • trunk/game/objects/agents/player/stand/225/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:stand:225" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:225" x_offset="0" y_offset="-25"> 
    22        <frame source="stand_0.png" /> 
    33        <frame source="stand_1.png" /> 
  • trunk/game/objects/agents/player/stand/270/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:stand:270" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:270" x_offset="0" y_offset="-25"> 
    22        <frame source="stand_0.png" /> 
    33        <frame source="stand_1.png" /> 
  • trunk/game/objects/agents/player/stand/315/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:stand:315" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:315" x_offset="0" y_offset="-25"> 
    22        <frame source="stand_0.png" /> 
    33        <frame source="stand_1.png" /> 
  • trunk/game/objects/agents/player/use/000/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:use:000" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:use:000" x_offset="0" y_offset="-25"> 
    22        <frame source="use_0.png" /> 
    33        <frame source="use_1.png" /> 
  • trunk/game/objects/agents/player/use/045/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:use:045" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:use:045" x_offset="0" y_offset="-25"> 
    22        <frame source="use_0.png" /> 
    33        <frame source="use_1.png" /> 
  • trunk/game/objects/agents/player/use/090/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:use:090" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:use:090" x_offset="0" y_offset="-25"> 
    22        <frame source="use_0.png" /> 
    33        <frame source="use_1.png" /> 
  • trunk/game/objects/agents/player/use/135/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:use:135" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:use:135" x_offset="0" y_offset="-25"> 
    22        <frame source="use_0.png" /> 
    33        <frame source="use_1.png" /> 
  • trunk/game/objects/agents/player/use/180/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:use:180" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:use:180" x_offset="0" y_offset="-25"> 
    22        <frame source="use_0.png" /> 
    33        <frame source="use_1.png" /> 
  • trunk/game/objects/agents/player/use/225/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:use:225" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:use:225" x_offset="0" y_offset="-25"> 
    22        <frame source="use_0.png" /> 
    33        <frame source="use_1.png" /> 
  • trunk/game/objects/agents/player/use/270/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:use:270" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:use:270" x_offset="0" y_offset="-25"> 
    22        <frame source="use_0.png" /> 
    33        <frame source="use_1.png" /> 
  • trunk/game/objects/agents/player/use/315/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:use:315" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:use:315" x_offset="0" y_offset="-25"> 
    22        <frame source="use_0.png" /> 
    33        <frame source="use_1.png" /> 
  • trunk/game/objects/agents/player/walk/000/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:walk:000" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:000" x_offset="0" y_offset="-25"> 
    22        <frame source="walk_0.png" /> 
    33        <frame source="walk_1.png" /> 
  • trunk/game/objects/agents/player/walk/045/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:walk:045" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:045" x_offset="0" y_offset="-25"> 
    22        <frame source="walk_0.png" /> 
    33        <frame source="walk_1.png" /> 
  • trunk/game/objects/agents/player/walk/090/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:walk:090" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:090" x_offset="0" y_offset="-25"> 
    22        <frame source="walk_0.png" /> 
    33        <frame source="walk_1.png" /> 
  • trunk/game/objects/agents/player/walk/135/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:walk:135" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:135" x_offset="0" y_offset="-25"> 
    22        <frame source="walk_0.png" /> 
    33        <frame source="walk_1.png" /> 
  • trunk/game/objects/agents/player/walk/180/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:walk:180" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:180" x_offset="0" y_offset="-25"> 
    22        <frame source="walk_0.png" /> 
    33        <frame source="walk_1.png" /> 
  • trunk/game/objects/agents/player/walk/225/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:walk:225" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:225" x_offset="0" y_offset="-25"> 
    22        <frame source="walk_0.png" /> 
    33        <frame source="walk_1.png" /> 
  • trunk/game/objects/agents/player/walk/270/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:walk:270" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:270" x_offset="0" y_offset="-25"> 
    22        <frame source="walk_0.png" /> 
    33        <frame source="walk_1.png" /> 
  • trunk/game/objects/agents/player/walk/315/animation.xml

    r329 r365  
    1 <animation delay="100" namespace="PAPRG" id="player:walk:315" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:315" x_offset="0" y_offset="-25"> 
    22        <frame source="walk_0.png" /> 
    33        <frame source="walk_1.png" /> 
  • trunk/game/utilities/agentXmlGen.py

    r328 r365  
    3030    @type delay: string 
    3131    @param delay: Animation delay (used in animation.xml) 
    32     @type xoff: string 
    33     @param xoff: X offset (used in animation.xml) 
     32    @type x_off: string 
     33    @param x_off: X offset (used in animation.xml) 
    3434    @type y_off: string 
    3535    @param y_off: Y offset (used in animation.xml) 
     
    6363                            + '/animation.xml" direction="'  
    6464                            + str(int(angle)) + '" />\n') 
    65                     if not generateAnimation(angle_path,delay,xoff,y_off): 
     65                    if not generateAnimation(angle_path,delay,x_off,y_off): 
    6666                        log.error("Failed to create animation for " + anum\ 
    6767                                   + " (angle: " + angle + ")") 
     
    9898    return 0 
    9999 
    100 def generateAnimation(path, delay, xoff, y_off): 
     100def generateAnimation(path, delay, x_off, y_off): 
    101101    """ Generate animation.xml for a given path. 
    102102    @type path: string  
Note: See TracChangeset for help on using the changeset viewer.