Changeset 396 for trunk


Ignore:
Timestamp:
11/24/09 22:52:57 (10 years ago)
Author:
zenbitz
Message:

dialogue fixes

Location:
trunk/game
Files:
8 edited

Legend:

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

    r379 r396  
    3030              - "Glad to see you're feeling better." 
    3131              - gratitude 
    32               - pc.met('bart') and not quest.hasFinishedQuest('beer') 
     32              - pc.met('bart') and quest.hasFinishedQuest('beer') 
    3333            -  
    3434              - "Same old Bart,  I see." 
     
    8686               - "By the way, Bart, I am looking for a chap named 'Pekko', you know were I can find him?" 
    8787               - help_fedex 
    88                - quest.hasQuest('fedex') and not quest.hasFinishedQuest('fedex') 
     88               - quest.hasQuest('fedex') and not quest['fedex'].isGoalValue('found_pekko') 
     89             - 
     90               - "Hm.  You got a good buzz on, today?" 
     91               - elaborate_beer 
     92               - not quest.hasQuest('beer') and not quest.hasFinishedQuest('beer') 
    8993             - 
    9094               - "Hey, try my fantastic brew!" 
     
    9296               - quest['beer'].getValue('beer_quality') != 0 
    9397             - 
    94                - "Did you hear about Pekko?" 
    95                - dead_pekko 
    96              - 
    9798               - "Well, I am off to make some beer, wish me luck!" 
    9899               - end 
    99                - quest.hasQuest('beer') and not quest.hasFinishedQuest('beer') 
     100               - quest.hasQuest('beer') and not quest.hasFinishedQuest('beer') and quest['beer'].getValue('beer_quality') == 0 
    100101             - 
    101102               - "Adios, Bart" 
    102103               - end 
    103104               - not quest.hasQuest('beer') or quest.hasFinishedQuest('beer') 
     105             - 
     106               - "Did you hear about Pekko?" 
     107               - dead_pekko 
     108               - quest['fedex'].isGoalValue('found_pekko') 
    104109             - 
    105110               - "Pekko was murdered.  And someone's responsible." 
  • trunk/game/dialogue/fguard.yaml

    r379 r396  
    137137             - "I'm trying to make beer, can you help me find some stuff?" 
    138138             - help_beer 
    139              - quest.hasQuest('beer') and not quest.hasFinishedQuest('beer') 
     139             - quest['beer'].isGoalValue('beer_instructions') and not quest.hasFinishedQuest('beer') 
    140140           - 
    141141             - "I guess I'll see if I can't find this Pekko character for you." 
    142142             - end 
    143              - quest.hasQuest('fedex') and not quest.hasFinishedQuest('fedex') 
     143             - quest.hasQuest('fedex') and not quest.hasFinishedQuest('fedex') and not quest['fedex'].isGoalValue('found_pekko') 
    144144           - 
    145145             - "So long, Janie.  Catch you later." 
  • trunk/game/dialogue_demo.py

    r353 r396  
    120120 
    121121    def set_value(state,quest_id, variable, value): 
    122         print "Set %s to %i"%(variable,value) 
     122        print "Set %s to %s"%(variable,value) 
    123123        state['quest'][quest_id].setValue(variable,value) 
    124124 
  • trunk/game/maps/map.xml

    r395 r396  
    36063606        <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"> 
    36073607                <instances> 
    3608                         <i id="long_coat_female0" is_open="None" locked="None" name="Aeon" 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" /> 
    3609                         <i dialogue="dialogue/drunkard.yaml" id="long_coat_male0" is_open="None" locked="None" name="Drunkard" 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" /> 
     3608                        <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" /> 
     3609                        <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" /> 
    36103610                        <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" /> 
    3611                         <i id="male_traveler0" is_open="None" locked="None" name="Gregor" 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" /> 
     3611                        <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" /> 
    36123612                        <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" /> 
    36133613                        <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" /> 
  • trunk/game/quests/beer.yaml

    r380 r396  
    2424        goal_value: 'Read' 
    2525 
    26     drunkard_water_asked: 
    27         value: 0 
    28         goal_value: 1 
    29         #strange little variable so you cannot ask drunkard about water twice. 
    30  
    3126    yeast_available: 
    3227        value: 1 
  • trunk/game/quests/fedex.yaml

    r380 r396  
    2626        # the goal_value currently has no effect. 
    2727          
     28    drunkard_water_asked: 
     29        value: 0 
     30        goal_value: 1 
     31        #strange little variable so you cannot ask drunkard about water twice. 
     32 
    2833    accused_of_murder: 
    2934        value: '' 
  • trunk/game/scripts/console.py

    r389 r396  
    106106            end_python = command[python_matches.end() + 1:] 
    107107            try: 
    108                 result = str(eval(compile(end_python,'<string>','single'))) 
     108                result = str(eval(compile(end_python,'<string>','eval'))) 
    109109            except Exception, e: 
    110110                result = str(e) 
  • trunk/game/scripts/gui/dialoguegui.py

    r372 r396  
    4747 
    4848        def set_value(state,quest_id, variable, value): 
    49             print "Set %s to %i"%(variable,value) 
     49            print "Set %s to %s"%(variable,value) 
    5050            state['quest'][quest_id].setValue(variable,value) 
    5151 
Note: See TracChangeset for help on using the changeset viewer.