Changeset 297:2844edb6c1cc


Ignore:
Timestamp:
04/08/11 20:36:03 (12 years ago)
Author:
Simon Cross <hodgestar@…>
Branch:
default
Phase:
public
Rebase:
38633438616636643135313330346635343462363930616663383766393066666536666462633761
Message:

Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • data/game.json

    r296 r297  
    1717        "fire_started_on_road": false,
    1818        "cannon_destroyed": false,
     19        "all_fishmonger_demons_dead": false,
     20        "kanedas_agreement_disrupted": false,
    1921        "final_battle_lost": false,
    2022        "final_battle_won": false
     
    2527        "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2], "brewed": false },
    2628        "teacupfull": { "type": "TeaCupFull", "level": "_limbo", "pos": [0, 0] },
    27         "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false }
     29        "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false },
     30        "salmon": { "type": "Salmon", "level": "fishmonger_house", "pos": [1, 3] }
    2831    },
    2932    "npcs": {
     
    3235        "hattori": { "type": "Hattori", "level": "road", "pos": [10, 3], "dsm": "npcs/hattori.json", "state": "start" },
    3336        "ichiro": { "type": "Ichiro", "level": "road", "pos": [11, 3], "dsm": "npcs/ichiro.json", "state": "start" },
    34         "kaneda": { "type": "Kaneda", "level": "tea_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
     37        "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [10, 10], "dsm": "npcs/kaneda2.json", "state": "start" },
     38        "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [11, 10], "dsm": "npcs/tetsuo.json", "state": "start" },
     39        "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
    3540        "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 3], "dsm": "npcs/kumiko.json", "state": "start" },
     41        "maneki": { "type": "Maneki", "level": "market", "pos": [10, 10], "dsm": "npcs/maneki.json", "state": "start" },
     42        "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [10, 10], "dsm": "npcs/fishmonger.json", "state": "start" },
    3643        "actor": { "type": "Actor", "level": "theatre", "pos": [8, 3], "dsm": "npcs/actor.json", "state": "start" },
    3744        "sasuke": { "type": "Sasuke", "level": "road", "pos": [9, 3], "dsm": "npcs/sasuke.json", "state": "start" },
  • data/npcs/fishmonger.json

    r238 r297  
    22    "start" : {
    33        "events" : [
    4             { "matches" : "world.all_fishmonger_demons_dead", "next": "state.saved" }
     4            { "matches" : "world.missions.all_fishmonger_demons_dead", "next": "state.saved" }
    55        ]
    66    },
  • data/npcs/kaneda2.json

    r207 r297  
    1818    "inspecting" : {
    1919        "events" : [
    20             { "matches" : "world.agreement_disrupted", "next": "state.preposterous" }
     20            { "matches" : "world.missions.kanedas_agreement_disrupted", "next": "state.preposterous" }
    2121        ]
    2222    },
  • data/npcs/maneki.json

    r201 r297  
    22    "start" : {
    33        "text" : "Greetings, fox. Ah, but you are no ordinary fox, are you?",
    4         "events" : [
    5             { "matches" : "I am a kitsune.", "next": "state.thoughtasmuch" },
    6             { "matches" : "I’m perfectly normal.", "next": "state.sure" },
    7             { "matches" : "You’re not even a real cat!", "next": "state.unkind" }
     4        "choices" : [
     5            { "text" : "I am a kitsune.", "next": "state.thoughtasmuch" },
     6            { "text" : "I’m perfectly normal.", "next": "state.sure" },
     7            { "text" : "You’re not even a real cat!", "next": "state.unkind" }
    88        ]
    99    },
     
    2626    "waiting" : {
    2727        "events" : [
    28             { "matches" : "world.got_salmon", "next": "state.goodjob" }
     28            { "matches" : "world.fox.item == 'salmon'", "next": "state.goodjob" }
    2929        ]
    3030    },
  • skaapsteker/sprites/items.py

    r296 r297  
    4343        super(Vase, self).setup(**opts)
    4444        self.broken = broken
     45
     46
     47class Salmon(Item):
     48    image_file = 'dummy.png'
  • skaapsteker/sprites/npcs.py

    r224 r297  
    2525
    2626
     27class Tetsuo(NPC):
     28    image_dir = 'sprites/tetsuo'
     29
     30
    2731class Kumiko(NPC):
    2832    image_dir = 'sprites/geisha'
     33
     34
     35class FishMonger(NPC):
     36    image_dir = 'sprites/fishmonger'
     37    animation_regexes = [
     38        ("standing", r"^.*_standing.png$"),
     39    ]
     40
     41
     42class Maneki(NPC):
     43    image_dir = 'sprites/'
     44    animation_regexes = [
     45        ("manekiing", "dummy.png"),
     46    ]
    2947
    3048
     
    3452        ("noh", "dummy.png"),
    3553    ]
     54
    3655
    3756class Sasuke(NPC):
Note: See TracChangeset for help on using the changeset viewer.