diff options
Diffstat (limited to 'game')
| -rw-r--r-- | game/03_init.rpy | 6 | ||||
| -rw-r--r-- | game/battle.rpy | 1 | ||||
| -rw-r--r-- | game/quest.rpy | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/game/03_init.rpy b/game/03_init.rpy index 0a55ac7..222738a 100644 --- a/game/03_init.rpy +++ b/game/03_init.rpy @@ -145,9 +145,9 @@ init python: valb=dl_search(persistent.allfiles, 0, val)[1] if valb == ERR_INVALID: - print ("Invalid Sound: %s (%s)" % (path, val)) - return "sfx/regnum.mp3" # FIXME - return valb + print ("Invalid Sound: %s" % (val)) + return RetString("sfx/regnum.mp3") # FIXME + return RetString(valb) # Load sfx (or rather, register the path) diff --git a/game/battle.rpy b/game/battle.rpy index 4494322..4b6d5e0 100644 --- a/game/battle.rpy +++ b/game/battle.rpy @@ -145,6 +145,7 @@ label results: if (response["rank"]): Player["level"]+=1 Player["max_ap"]+=response["rank"]-1 + # TODO: Update exp/max_exp fields update_ap() #Player["exp"]+=1 expmsg="PLAYER {b}RANK UP!{/b} (Max Ap: %d -> %d)" % (Player["max_ap"]-response["rank"]+1, Player["max_ap"]) diff --git a/game/quest.rpy b/game/quest.rpy index 3609188..bc26c33 100644 --- a/game/quest.rpy +++ b/game/quest.rpy @@ -49,7 +49,6 @@ label quest_select: arena=copy.copy(arx) name=arena.pop(0) req=arena.pop(0) - sfx=arena.pop(0) if Player["quest"] >= req: worldmap.append((name, arena)) @@ -61,6 +60,9 @@ label quest_select: renpy.jump("restore") # Now we have the mapselected array, with dict + sfx=mapselected.pop(0) + TMP_MUSIC=get_sfx(sfx) + #renpy.play for arx in mapselected: quest=copy.copy(arx) name=quest["name"] @@ -159,7 +161,10 @@ label quest_selected: del bg_is_showing # Okay, story-telling time is over: To arms! - # quest["music"] + # + $ TMP_MUSIC=get_sfx(quest["music"]) + #$ print str(TMP_MUSIC) + #play music TMP_MUSIC.id() fadein 0.5 play music MUSIC_BATTLE.id() fadein 0.5 $ renpy.free_memory() window hide |