Changeset 413 for trunk/game


Ignore:
Timestamp:
11/30/09 06:44:20 (10 years ago)
Author:
zenbitz
Message:

added Matti, snowshoveler, some other minor tweaks

Location:
trunk/game
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/game/dialogue/fguard.yaml

    r406 r413  
    299299 
    300300    report_to_boss: 
    301        - say: "You can talk to Nikko, but I don't think you'll find the justice you are looking for." 
     301       - say: "You can talk to Kimmo, but I don't think you'll find the justice you are looking for." 
    302302       - responses: 
    303303           - 
  • trunk/game/dialogue/mall_template.yaml

    r406 r413  
    2828              - "I'm looking for stuff to make beer with " 
    2929              - help_beer 
    30               - quest.hasQuest('beer') and not quest.hasFinishedQuest('beer') 
     30              - quest.hasQuest('beer') and not quest.hasFinishedQuest('beer') and quest['beer'].isGoalValue('beer_instructions') 
    3131            -  
    3232              - "I'm the beer savior, remember?" 
    3333              - gratitude 
    34               - quest.hasFinishedQuest('beer') and quest['fedex'].getValue('beer_quality') >= 1 
     34              - quest['beer'].getValue('beer_quality') >= 1 
    3535            -  
    3636              - "I'm looking for Pekko, you seen him?" 
    3737              - help_fedex 
    38               - quest.hasQuest('fedex') and not quest.hasFinishedQuest('fedex') 
     38              - quest.hasQuest('fedex') and not quest.hasFinishedQuest('fedex') and not quest['fedex'].isGoalValue('found_pekko') 
    3939            - 
    4040              - "Whoa!  It talks!  Never mind" 
  • trunk/game/maps/map.xml

    r412 r413  
    53715371        <layer grid_type="square" id="ObjectLayer" pathing="cell_edges_and_diagonals" rotation="0.0" transparency="0" x_offset="0.0" x_scale="1.0" y_offset="0.0" y_scale="1.0"> 
    53725372                <instances> 
    5373                         <i dialogue="dialogue/fguard.yaml" id="long_coat_female0" is_open="None" locked="None" name="Janie" o="long_coat_female" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A woman wearing a large coat" x="-5.0" y="-3.0" z="0.0" /> 
     5373                        <i dialogue="dialogue/fguard.yaml" id="long_coat_female0" is_open="None" locked="None" name="Janie" o="long_coat_female" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A woman wearing a large coat, and a big gun" x="-5.0" y="-3.0" z="0.0" /> 
    53745374                        <i dialogue="dialogue/drunkard.yaml" id="long_coat_male0" is_open="None" locked="None" name="Bart" o="long_coat_male" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A very drunk looking man" x="-5.0" y="-4.0" z="0.0" /> 
    53755375                        <i dialogue="dialogue/farmer.yaml" id="male_farmer0" is_open="None" locked="None" name="Manslow" o="male_farmer_1" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A grimy looking farmer" x="-5.0" y="-5.0" z="0.0" /> 
    5376                         <i dialogue="dialogue/crazy_swede.yaml" id="male_traveler0" is_open="None" locked="None" name="Skwisgaar" o="male_traveler_1" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A wandering traveler" x="-5.0" y="-6.0" z="0.0" /> 
     5376                        <i dialogue="dialogue/crazy_swede.yaml" id="male_traveler0" is_open="None" locked="None" name="Skwisgaar" o="male_traveler_1" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A wild-eyed man with an axe" x="-5.0" y="-6.0" z="0.0" /> 
     5377                        <i dialogue="dialogue/snowshoveler.yaml" id="male_traveler01" is_open="None" locked="None" name="Matti" o="male_traveler_1" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A man shoveling snow into a hole" x="-8.0" y="-6.0" z="0.0" /> 
    53775378                        <i id="woman01" is_open="None" locked="None" name="Tina" o="npc_woman" object_type="NonPlayerCharacter" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A friendly woman" x="-5.0" y="-7.0" z="0.0" /> 
    53785379                        <i id="crate02" is_open="False" locked="False" name="A dirty old crate" o="crate" object_type="WoodenCrate" r="0" target_map="None" target_map_name="None" target_x="None" target_y="None" text="A crate that is covered in grime and dirt. There doesn&apos;t seem to be anything remarkable about it" x="-2.0" y="-11.0" z="0.0" /> 
Note: See TracChangeset for help on using the changeset viewer.