Changeset 317 for trunk


Ignore:
Timestamp:
10/12/09 08:55:28 (10 years ago)
Author:
barra_parpg
Message:

Patch by sirren & mvbarracuda:

  • New player character animations
  • Changed PC object id to player for consistency reasons (agentxmlgen.py uses the folder name for the object id)
  • Renamed parpg-editor >> parpg_editor (use underscores as space characters!)
  • SVL eol-style >> native fixes
Location:
trunk/game
Files:
419 added
182 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/game/dialogue-demo.py

    • Property svn:eol-style set to native
  • trunk/game/editor/loaders.py

    • Property svn:eol-style set to native
  • trunk/game/editor/savers.py

    • Property svn:eol-style set to native
  • trunk/game/local_loaders/__init__.py

    • Property svn:eol-style set to native
  • trunk/game/local_loaders/loaders.py

    • Property svn:eol-style set to native
  • trunk/game/local_loaders/xmlmap.py

    • Property svn:eol-style set to native
  • trunk/game/maps/map.xml

    r316 r317  
    19451945      <i x="8" o="block" z="0.0" y="-3" r="0"/> 
    19461946      <!-- There must be one and one only PC character --> 
    1947       <i x="0.0" o="PC" z="0.0" y="0.0" r="0" id="PC" object_type="PlayerCharacter"/> 
     1947      <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 --> 
    19491949      <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"/> 
  • trunk/game/objects/agents/player/player.xml

    r248 r317  
    11<?fife type="object"?> 
    2 <object id="PC" namespace="PARPG" blocking="1" static="0"> 
     2<object id="player" namespace="PARPG" blocking="1" static="0"> 
     3        <action id="pick_up"> 
     4                <animation source="pick_up/000/animation.xml" direction="0" /> 
     5                <animation source="pick_up/045/animation.xml" direction="45" /> 
     6                <animation source="pick_up/090/animation.xml" direction="90" /> 
     7                <animation source="pick_up/135/animation.xml" direction="135" /> 
     8                <animation source="pick_up/180/animation.xml" direction="180" /> 
     9                <animation source="pick_up/225/animation.xml" direction="225" /> 
     10                <animation source="pick_up/270/animation.xml" direction="270" /> 
     11                <animation source="pick_up/315/animation.xml" direction="315" /> 
     12        </action> 
    313        <action id="run"> 
    4                 <animation source="walk/000/animation.xml" direction="0" /> 
    5                 <animation source="walk/045/animation.xml" direction="45" /> 
    6                 <animation source="walk/090/animation.xml" direction="90" /> 
    7                 <animation source="walk/135/animation.xml" direction="135" /> 
    8                 <animation source="walk/180/animation.xml" direction="180" /> 
    9                 <animation source="walk/225/animation.xml" direction="225" /> 
    10                 <animation source="walk/270/animation.xml" direction="270" /> 
    11                 <animation source="walk/315/animation.xml" direction="315" /> 
     14                <animation source="run/000/animation.xml" direction="0" /> 
     15                <animation source="run/045/animation.xml" direction="45" /> 
     16                <animation source="run/090/animation.xml" direction="90" /> 
     17                <animation source="run/135/animation.xml" direction="135" /> 
     18                <animation source="run/180/animation.xml" direction="180" /> 
     19                <animation source="run/225/animation.xml" direction="225" /> 
     20                <animation source="run/270/animation.xml" direction="270" /> 
     21                <animation source="run/315/animation.xml" direction="315" /> 
    1222        </action> 
    1323        <action id="stand"> 
     
    2131                <animation source="stand/315/animation.xml" direction="315" /> 
    2232        </action> 
     33        <action id="use"> 
     34                <animation source="use/000/animation.xml" direction="0" /> 
     35                <animation source="use/045/animation.xml" direction="45" /> 
     36                <animation source="use/090/animation.xml" direction="90" /> 
     37                <animation source="use/135/animation.xml" direction="135" /> 
     38                <animation source="use/180/animation.xml" direction="180" /> 
     39                <animation source="use/225/animation.xml" direction="225" /> 
     40                <animation source="use/270/animation.xml" direction="270" /> 
     41                <animation source="use/315/animation.xml" direction="315" /> 
     42        </action> 
    2343        <action id="walk"> 
    2444                <animation source="walk/000/animation.xml" direction="0" /> 
     
    3151                <animation source="walk/315/animation.xml" direction="315" /> 
    3252        </action> 
    33         <action id="approachDoor"> 
    34                 <animation source="walk/000/animation.xml" direction="0" /> 
    35                 <animation source="walk/045/animation.xml" direction="45" /> 
    36                 <animation source="walk/090/animation.xml" direction="90" /> 
    37                 <animation source="walk/135/animation.xml" direction="135" /> 
    38                 <animation source="walk/180/animation.xml" direction="180" /> 
    39                 <animation source="walk/225/animation.xml" direction="225" /> 
    40                 <animation source="walk/270/animation.xml" direction="270" /> 
    41                 <animation source="walk/315/animation.xml" direction="315" /> 
    42         </action> 
    4353</object> 
  • trunk/game/objects/agents/player/stand/000/animation.xml

    r258 r317  
    1 <animation delay="125" namespace="PAPRG" id="PC:stand:000" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:000" x_offset="0" y_offset="-40"> 
    22        <frame source="stand_idle_0.png" /> 
    33        <frame source="stand_idle_1.png" /> 
  • trunk/game/objects/agents/player/stand/045/animation.xml

    r258 r317  
    1 <animation delay="125" namespace="PAPRG" id="PC:stand:045" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:045" x_offset="0" y_offset="-40"> 
    22        <frame source="stand_idle_0.png" /> 
    33        <frame source="stand_idle_1.png" /> 
  • trunk/game/objects/agents/player/stand/090/animation.xml

    r258 r317  
    1 <animation delay="125" namespace="PAPRG" id="PC:stand:090" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:090" x_offset="0" y_offset="-40"> 
    22        <frame source="stand_idle_0.png" /> 
    33        <frame source="stand_idle_1.png" /> 
  • trunk/game/objects/agents/player/stand/135/animation.xml

    r258 r317  
    1 <animation delay="125" namespace="PAPRG" id="PC:stand:135" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:135" x_offset="0" y_offset="-40"> 
    22        <frame source="stand_idle_0.png" /> 
    33        <frame source="stand_idle_1.png" /> 
  • trunk/game/objects/agents/player/stand/180/animation.xml

    r258 r317  
    1 <animation delay="125" namespace="PAPRG" id="PC:stand:180" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:180" x_offset="0" y_offset="-40"> 
    22        <frame source="stand_idle_0.png" /> 
    33        <frame source="stand_idle_1.png" /> 
  • trunk/game/objects/agents/player/stand/225/animation.xml

    r258 r317  
    1 <animation delay="125" namespace="PAPRG" id="PC:stand:225" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:225" x_offset="0" y_offset="-40"> 
    22        <frame source="stand_idle_0.png" /> 
    33        <frame source="stand_idle_1.png" /> 
  • trunk/game/objects/agents/player/stand/270/animation.xml

    r258 r317  
    1 <animation delay="125" namespace="PAPRG" id="PC:stand:270" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:270" x_offset="0" y_offset="-40"> 
    22        <frame source="stand_idle_0.png" /> 
    33        <frame source="stand_idle_1.png" /> 
  • trunk/game/objects/agents/player/stand/315/animation.xml

    r258 r317  
    1 <animation delay="125" namespace="PAPRG" id="PC:stand:315" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:stand:315" x_offset="0" y_offset="-40"> 
    22        <frame source="stand_idle_0.png" /> 
    33        <frame source="stand_idle_1.png" /> 
  • trunk/game/objects/agents/player/walk/000/animation.xml

    r258 r317  
    1 <animation delay="100" namespace="PAPRG" id="PC:run:000" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:000" x_offset="0" y_offset="-40"> 
     2        <frame source="walk_0.png" /> 
    23        <frame source="walk_1.png" /> 
    34        <frame source="walk_2.png" /> 
  • trunk/game/objects/agents/player/walk/045/animation.xml

    r258 r317  
    1 <animation delay="100" namespace="PAPRG" id="PC:run:045" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:045" x_offset="0" y_offset="-40"> 
     2        <frame source="walk_0.png" /> 
    23        <frame source="walk_1.png" /> 
    34        <frame source="walk_2.png" /> 
  • trunk/game/objects/agents/player/walk/090/animation.xml

    r258 r317  
    1 <animation delay="100" namespace="PAPRG" id="PC:run:090" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:090" x_offset="0" y_offset="-40"> 
     2        <frame source="walk_0.png" /> 
    23        <frame source="walk_1.png" /> 
    34        <frame source="walk_2.png" /> 
  • trunk/game/objects/agents/player/walk/135/animation.xml

    r258 r317  
    1 <animation delay="100" namespace="PAPRG" id="PC:run:135" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:135" x_offset="0" y_offset="-40"> 
     2        <frame source="walk_0.png" /> 
    23        <frame source="walk_1.png" /> 
    34        <frame source="walk_2.png" /> 
  • trunk/game/objects/agents/player/walk/180/animation.xml

    r258 r317  
    1 <animation delay="100" namespace="PAPRG" id="PC:run:180" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:180" x_offset="0" y_offset="-40"> 
     2        <frame source="walk_0.png" /> 
    23        <frame source="walk_1.png" /> 
    34        <frame source="walk_2.png" /> 
  • trunk/game/objects/agents/player/walk/225/animation.xml

    r258 r317  
    1 <animation delay="100" namespace="PAPRG" id="PC:run:225" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:225" x_offset="0" y_offset="-40"> 
     2        <frame source="walk_0.png" /> 
    23        <frame source="walk_1.png" /> 
    34        <frame source="walk_2.png" /> 
  • trunk/game/objects/agents/player/walk/270/animation.xml

    r258 r317  
    1 <animation delay="100" namespace="PAPRG" id="PC:run:270" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:270" x_offset="0" y_offset="-40"> 
     2        <frame source="walk_0.png" /> 
    23        <frame source="walk_1.png" /> 
    34        <frame source="walk_2.png" /> 
  • trunk/game/objects/agents/player/walk/315/animation.xml

    r258 r317  
    1 <animation delay="100" namespace="PAPRG" id="PC:run:315" x_offset="0" y_offset="-40"> 
     1<animation delay="100" namespace="PAPRG" id="player:walk:315" x_offset="0" y_offset="-40"> 
     2        <frame source="walk_0.png" /> 
    23        <frame source="walk_1.png" /> 
    34        <frame source="walk_2.png" /> 
  • trunk/game/parpg_editor.py

    • Property svn:eol-style set to native
  • trunk/game/scripts/console.py

    • Property svn:eol-style set to native
  • trunk/game/scripts/dialogue.py

    • Property svn:eol-style set to native
  • trunk/game/scripts/dialoguegui.py

    • Property svn:eol-style set to native
  • trunk/game/scripts/objects/doors.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_console.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_container.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_dialogue.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_game_object.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_living.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_lockable.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_objects_base.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_openable.py

    • Property svn:eol-style set to native
  • trunk/game/tests/test_scriptable.py

    • Property svn:eol-style set to native
  • trunk/game/utilities/agentXmlGen.py

    • Property svn:eol-style set to native
Note: See TracChangeset for help on using the changeset viewer.