Changeset 594


Ignore:
Timestamp:
07/22/10 17:56:23 (9 years ago)
Author:
beliar
Message:

Patch by Beliar.

  • The default z-position of agents that have an object type of "MapItem?" is now -0.1. This fixes the issue that items are rendered in front of other agents.
  • Removed the explicit definition of a z-position from the *_agent.yaml files. They now use either the default position of agents (already present before this commit) or items, depending on the object type.
Location:
trunk/game
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/game/maps/all_agents.yaml

    r592 r594  
    2020    ObjectModel: "player" 
    2121    Map: "Mall" 
    22     Position: [2.0, -8.0, 0.0] 
     22    Position: [2.0, -8.0] 
    2323    Rotation: 0 
    2424    Inventory: 
     
    3434    Text: "A woman wearing a large coat, and a big gun." 
    3535    Map: "Mall" 
    36     Position: [-5.0, -3.0, 0.0] 
     36    Position: [-5.0, -3.0] 
    3737    Rotation: 0 
    3838    Inventory: 
     
    4646    Text: "A very drunk looking man." 
    4747    Map: "Mall" 
    48     Position: [-5.0, -4.0, 0.0] 
     48    Position: [-5.0, -4.0] 
    4949    Rotation: 0 
    5050--- 
     
    5656    Text: "A wild-eyed man with an axe." 
    5757    Map: "Mall" 
    58     Position: [-5.0, -6.0, 0.0] 
     58    Position: [-5.0, -6.0] 
    5959    Rotation: 0 
    6060    Inventory: 
     
    6868    Text: "A man shoveling snow into a hole." 
    6969    Map: "Mall" 
    70     Position: [-8.0, -6.0, 0.0] 
     70    Position: [-8.0, -6.0] 
    7171    Rotation: 0 
    7272--- 
     
    7878    Text: "A tough looking dude." 
    7979    Map: "Mall" 
    80     Position: [2.0, -6.0, 0.0]  
     80    Position: [2.0, -6.0]  
    8181    Rotation: 0 
    8282--- 
     
    8888    Text: "A lean man with a sharp face and an appraising gaze." 
    8989    Map: "Mall" 
    90     Position: [3.0, -6.0, 0.0]  
     90    Position: [3.0, -6.0]  
    9191    Rotation: 0 
    9292--- 
     
    9898    Text: "An older man who exudes confidence and ability." 
    9999    Map: "Mall" 
    100     Position: [4.0, -6.0, 0.0] 
     100    Position: [4.0, -6.0] 
    101101    Rotation: 0 
    102102--- 
     
    108108    Text: "A business-like woman, short and stout." 
    109109    Map: "Mall" 
    110     Position: [5.0, -7.0, 0.0] 
     110    Position: [5.0, -7.0] 
    111111    Rotation: 0 
    112112--- 
     
    118118    Text: "An ancient crone with a tight lipped smile.  She has an unlit cigarette dangling from her lips." 
    119119    Map: "Mall" 
    120     Position: [-6.0, -7.0, 0.0] 
     120    Position: [-6.0, -7.0] 
    121121    Rotation: 0 
    122122--- 
     
    128128    Text: "A dark haired, scantily clad woman giving you the once over." 
    129129    Map: "Mall" 
    130     Position: [-7.0, -7.0, 0.0] 
     130    Position: [-7.0, -7.0] 
    131131    Rotation: 0 
    132132--- 
     
    138138    Text: "A scantily clad blond, checking you out." 
    139139    Map: "Mall" 
    140     Position: [-8.0, -7.0, 0.0] 
     140    Position: [-8.0, -7.0] 
    141141    Rotation: 0 
    142142--- 
     
    148148    Text: "A hard-faced pretty young woman. She seems to be scowling." 
    149149    Map: "Mall" 
    150     Position: [-5.0, -7.0, 0.0] 
     150    Position: [-5.0, -7.0] 
    151151    Rotation: 0 
    152152--- 
     
    158158    Text: "A plain looking girl with a faraway look in her eye." 
    159159    Map: "Mall" 
    160     Position: [-5.0, -9.0, 0.0] 
     160    Position: [-5.0, -9.0] 
    161161    Rotation: 0 
    162162--- 
     
    168168    Text: "A grimy looking farmer." 
    169169    Map: "Farm" 
    170     Position: [-3.0, -3.0, 0.0] 
     170    Position: [-3.0, -3.0] 
    171171    Rotation: 0 
    172172    Inventory: 
     
    180180    Text: "An earstwhile boy, working hard." 
    181181    Map: "Farm" 
    182     Position: [3.0, 4.0, 0.0] 
     182    Position: [3.0, 4.0] 
    183183    Rotation: 0 
    184184---             
     
    190190    Text: "A grimy looking farmer." 
    191191    Map: "Farm" 
    192     Position: [4.0, 3.0, 0.0] 
     192    Position: [4.0, 3.0] 
    193193    Rotation: 0 
    194194--- 
     
    198198    ItemType: "Empty beer bottle" 
    199199    Map: "Mall" 
    200     Position: [-5.0, -11.0, 0.0] 
    201     Rotation: 0 
     200    Position: [-5.0, -11.0] 
     201    Rotation: 0 
  • trunk/game/maps/map2_agents.yaml

    r566 r594  
    1818    RealName: "To Mall" 
    1919    ObjectType: "ShantyDoor" 
    20     Position: [-2.0, 6.0, 0.0] 
     20    Position: [-2.0, 6.0] 
    2121    Rotation: 0 
    2222    TargetMap: "Mall" 
  • trunk/game/maps/map_agents.yaml

    r571 r594  
    1919    ObjectType: "WoodenCrate" 
    2020    Text: "A crate that is covered in grime and dirt. There doesn't seem to be anything remarkable about it." 
    21     Position: [-2.0, -11.0, 0.0] 
     21    Position: [-2.0, -11.0] 
    2222    Rotation: 0 
    2323    Items: 
     
    2828    RealName: "To Farm" 
    2929    ObjectType: "ShantyDoor" 
    30     Position: [-6.0, -13.0, 0.0] 
     30    Position: [-6.0, -13.0] 
    3131    Rotation: 0 
    3232    TargetMap: "Farm" 
     
    3737    RealName: "Footlocker" 
    3838    ObjectType: "Footlocker" 
    39     Position: [-9.0, 0.0, 0.0] 
     39    Position: [-9.0, 0.0] 
    4040    Rotation: 255 
    4141    Items: 
  • trunk/game/scripts/gamemodel.py

    r592 r594  
    398398        x_pos = agent["Position"][0] 
    399399        y_pos = agent["Position"][1] 
    400         z_pos = agent["Position"][2] if len(agent["Position"]) == 3 else 0.0 
     400        z_pos = agent["Position"][2] if len(agent["Position"]) == 3 \ 
     401                                        else -0.1 if object_type == "MapItem" \ 
     402                                        else 0.0   
    401403        stack_pos = agent["Stackposition"] if \ 
    402404                        agent.has_key("StackPosition") \ 
Note: See TracChangeset for help on using the changeset viewer.