Face parameter removal (astoria)
* Removed face parameter for Astoria and reposed events that relied on it.
This commit is contained in:
parent
9aa1f8dcac
commit
f66c5df6b7
@ -33,7 +33,7 @@ define character.astoria_say = Character("name_astoria_genie", show_icon="astori
|
|||||||
|
|
||||||
init python:
|
init python:
|
||||||
def ast(what, mouth=None, eyes=None, eyebrows=None, pupils=None, cheeks=None, tears=None,
|
def ast(what, mouth=None, eyes=None, eyebrows=None, pupils=None, cheeks=None, tears=None,
|
||||||
emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
|
emote=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
|
||||||
|
|
||||||
def show():
|
def show():
|
||||||
astoria.show()
|
astoria.show()
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
label ag_st_imperio:
|
label ag_st_imperio:
|
||||||
|
|
||||||
if ag_st_imperio.points == 0: # Intro for 1st event.
|
if ag_st_imperio.points == 0: # Intro for 1st event.
|
||||||
ast "" (face="neutral", xpos="right", ypos="base", trans=fade)
|
ast "" ("base", "base", "base", "mid", xpos="right", ypos="base", trans=fade)
|
||||||
gen "Ready for your first day of detention?" ("base", xpos="far_left", ypos="head")
|
gen "Ready for your first day of detention?" ("base", xpos="far_left", ypos="head")
|
||||||
ast "No..." ("annoyed", "base", "base", "R")
|
ast "No..." ("annoyed", "base", "base", "R")
|
||||||
ast "Do I really have to go?" ("clench", "base", "base", "mid")
|
ast "Do I really have to go?" ("clench", "base", "base", "mid")
|
||||||
@ -33,7 +33,7 @@ label ag_st_imperio:
|
|||||||
ast "See ya later!" ("smile", "base", "base", "mid") #smell ya later newbie! - gary oak
|
ast "See ya later!" ("smile", "base", "base", "mid") #smell ya later newbie! - gary oak
|
||||||
|
|
||||||
elif ag_st_imperio.points == 3: # Intro for 4th event.
|
elif ag_st_imperio.points == 3: # Intro for 4th event.
|
||||||
ast "" (face="annoyed", xpos="right", ypos="base", trans=fade)
|
ast "" ("annoyed", "base", "base", "mid", xpos="right", ypos="base", trans=fade)
|
||||||
gen "Time for another lesson, don't you think?" ("base", xpos="far_left", ypos="head")
|
gen "Time for another lesson, don't you think?" ("base", xpos="far_left", ypos="head")
|
||||||
ast "Do I really have to?" ("open", "narrow", "base", "R")
|
ast "Do I really have to?" ("open", "narrow", "base", "R")
|
||||||
ast "I'd rather not spend the day, getting yelled at..." ("annoyed", "narrow", "base", "down")
|
ast "I'd rather not spend the day, getting yelled at..." ("annoyed", "narrow", "base", "down")
|
||||||
@ -43,7 +43,7 @@ label ag_st_imperio:
|
|||||||
ast "..." ("annoyed", "base", "base", "R")
|
ast "..." ("annoyed", "base", "base", "R")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
ast "" (face="happy", xpos="right", ypos="base", trans=fade)
|
ast "" ("grin", "base", "base", "mid", xpos="right", ypos="base", trans=fade)
|
||||||
random:
|
random:
|
||||||
gen "Ready for another lesson-- I mean detention?" ("base", xpos="far_left", ypos="head")
|
gen "Ready for another lesson-- I mean detention?" ("base", xpos="far_left", ypos="head")
|
||||||
gen "Looking forward to curse your teacher again?" ("base", xpos="far_left", ypos="head")
|
gen "Looking forward to curse your teacher again?" ("base", xpos="far_left", ypos="head")
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -381,11 +381,9 @@ label wardrobe_menu():
|
|||||||
if wardrobe_music:
|
if wardrobe_music:
|
||||||
wardrobe_music = False
|
wardrobe_music = False
|
||||||
renpy.music.play(last_track)
|
renpy.music.play(last_track)
|
||||||
get_character_sayer(states.active_girl)("", face="happy")
|
|
||||||
else:
|
else:
|
||||||
wardrobe_music = True
|
wardrobe_music = True
|
||||||
renpy.music.play("music/Spring_In_My_Step.ogg", fadein=1)
|
renpy.music.play("music/Spring_In_My_Step.ogg", fadein=1)
|
||||||
get_character_sayer(states.active_girl)("", face="happy")
|
|
||||||
|
|
||||||
elif _choice == "randomise":
|
elif _choice == "randomise":
|
||||||
python:
|
python:
|
||||||
|
Loading…
Reference in New Issue
Block a user