forked from SilverStudioGames/WTS
Bug fixes
* Fixed Hermione 'suck it' repeat fail variant on tier 4 not working. * Fixed character emotes
This commit is contained in:
parent
bdc5a8be49
commit
a2e53fd8ee
@ -93,7 +93,9 @@ init python:
|
||||
astoria.set_face(mouth=mouth, eyes=eyes, eyebrows=eyebrows, pupils=pupils, cheeks=cheeks, tears=tears)
|
||||
redraw = True
|
||||
|
||||
astoria.set_emote(emote)
|
||||
if emote:
|
||||
astoria.set_emote(emote)
|
||||
redraw = True
|
||||
|
||||
if animation != False:
|
||||
astoria.animation = animation
|
||||
|
@ -92,7 +92,9 @@ init python in character:
|
||||
renpy.store.cho.set_face(mouth=mouth, eyes=eyes, eyebrows=eyebrows, pupils=pupils, cheeks=cheeks, tears=tears)
|
||||
redraw = True
|
||||
|
||||
renpy.store.cho.set_emote(emote)
|
||||
if emote:
|
||||
renpy.store.cho.set_emote(emote)
|
||||
redraw = True
|
||||
|
||||
if animation != False:
|
||||
renpy.store.cho.animation = animation
|
||||
|
@ -87,7 +87,9 @@ init python:
|
||||
hermione.set_face(mouth=mouth, eyes=eyes, eyebrows=eyebrows, pupils=pupils, cheeks=cheeks, tears=tears)
|
||||
redraw = True
|
||||
|
||||
hermione.set_emote(emote)
|
||||
if emote:
|
||||
hermione.set_emote(emote)
|
||||
redraw = True
|
||||
|
||||
if animation != False:
|
||||
hermione.animation = animation
|
||||
|
@ -128,7 +128,7 @@ label hg_pf_blowjob_T4_fail_intro:
|
||||
gen "(Tough luck...)" ("base", xpos="far_left", ypos="head")
|
||||
|
||||
$ states.her.mood += 6
|
||||
$ hg_pf_blowjob.fail()
|
||||
$ hg_pf_blowjob.fail_intentional()
|
||||
|
||||
jump end_hermione_event
|
||||
|
||||
@ -160,7 +160,7 @@ label hg_pf_blowjob_T4_fail_repeat:
|
||||
call her_walk(action="leave")
|
||||
|
||||
$ states.her.mood += 6
|
||||
$ hg_pf_blowjob.fail()
|
||||
$ hg_pf_blowjob.fail_intentional()
|
||||
|
||||
jump end_hermione_event
|
||||
|
||||
|
@ -91,7 +91,9 @@ init python:
|
||||
luna.set_face(mouth=mouth, eyes=eyes, eyebrows=eyebrows, pupils=pupils, cheeks=cheeks, tears=tears)
|
||||
redraw = True
|
||||
|
||||
luna.set_emote(emote)
|
||||
if emote:
|
||||
luna.set_emote(emote)
|
||||
redraw = True
|
||||
|
||||
if animation != False:
|
||||
luna.animation = animation
|
||||
|
@ -89,7 +89,9 @@ init python:
|
||||
susan.set_face(mouth=mouth, eyes=eyes, eyebrows=eyebrows, pupils=pupils, cheeks=cheeks, tears=tears)
|
||||
redraw = True
|
||||
|
||||
susan.set_emote(emote)
|
||||
if emote:
|
||||
susan.set_emote(emote)
|
||||
redraw = True
|
||||
|
||||
if animation != False:
|
||||
susan.animation = animation
|
||||
|
@ -91,7 +91,10 @@ init python:
|
||||
tonks.set_face(mouth=mouth, eyes=eyes, eyebrows=eyebrows, pupils=pupils, cheeks=cheeks, tears=tears)
|
||||
redraw = True
|
||||
|
||||
tonks.set_emote(emote)
|
||||
if emote:
|
||||
tonks.set_emote(emote)
|
||||
redraw = True
|
||||
|
||||
target_color = tonks_haircolor
|
||||
|
||||
if hair:
|
||||
|
@ -136,7 +136,7 @@ init python:
|
||||
|
||||
sprites = back_sprites + [x[1] for x in sprites]
|
||||
|
||||
return Fixed(*sprites, fit_first=True)
|
||||
return Fixed(*sprites, self.emote, fit_first=True)
|
||||
|
||||
@property
|
||||
def image(self):
|
||||
@ -573,15 +573,20 @@ init python:
|
||||
self.equip(renpy.random.choice(schedule))
|
||||
|
||||
def set_emote(self, emote):
|
||||
if isinstance(emote, str):
|
||||
path = posixpath.join(self.modpath, "characters", self.name, "poses", self.pose, "emote", emote)
|
||||
extensions = self.extensions
|
||||
|
||||
if not emote and not isinstance(emote, Null):
|
||||
self.emote = Null()
|
||||
return
|
||||
for f in renpy.list_files():
|
||||
fp, fn = os.path.split(f)
|
||||
fn, ext = os.path.splitext(fn)
|
||||
|
||||
if self.pose:
|
||||
path = "characters/{}/poses/{}/emote/{}.webp".format(self.name, self.pose, emote)
|
||||
if not fp == path or not ext in extensions:
|
||||
continue
|
||||
|
||||
self.emote = Image(f)
|
||||
break
|
||||
else:
|
||||
path = "characters/{}/emote/{}.webp".format(self.name, emote)
|
||||
self.emote = emote
|
||||
|
||||
self.emote = Image(path)
|
||||
self.is_stale()
|
||||
|
Loading…
Reference in New Issue
Block a user