Bug fixes

* Fixed regression in sprites positioning method
* Fixed missing paperwork unlock when using quick start
* Removed redundant align attribute from doll class
This commit is contained in:
LoafyLemon 2023-05-02 21:14:38 +01:00
parent f66c5df6b7
commit 3d73d8c00d
10 changed files with 17 additions and 15 deletions

View File

@ -48,8 +48,8 @@ init python:
layer = astoria.layer layer = astoria.layer
if xpos is not None or ypos is not None: if xpos is not None or ypos is not None:
xpos = sprite_pos.get("x").get(xpos, astoria.pos[0]) xpos = astoria.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
ypos = sprite_pos.get("y").get(ypos, astoria.pos[1]) ypos = astoria.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
astoria.pos = (xpos, ypos) astoria.pos = (xpos, ypos)
redraw = True redraw = True

View File

@ -47,8 +47,8 @@ init python in character:
layer = renpy.store.cho.layer layer = renpy.store.cho.layer
if xpos is not None or ypos is not None: if xpos is not None or ypos is not None:
xpos = renpy.store.sprite_pos.get("x").get(xpos, renpy.store.cho.pos[0]) xpos = renpy.store.cho.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
ypos = renpy.store.sprite_pos.get("y").get(ypos, renpy.store.cho.pos[1]) ypos = renpy.store.cho.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
renpy.store.cho.pos = (xpos, ypos) renpy.store.cho.pos = (xpos, ypos)
redraw = True redraw = True

View File

@ -42,8 +42,8 @@ init python:
layer = hermione.layer layer = hermione.layer
if xpos is not None or ypos is not None: if xpos is not None or ypos is not None:
xpos = sprite_pos.get("x").get(xpos, hermione.pos[0]) xpos = hermione.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
ypos = sprite_pos.get("y").get(ypos, hermione.pos[1]) ypos = hermione.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
hermione.pos = (xpos, ypos) hermione.pos = (xpos, ypos)
redraw = True redraw = True

View File

@ -33,8 +33,8 @@ init python:
layer = hooch.layer layer = hooch.layer
if xpos is not None or ypos is not None: if xpos is not None or ypos is not None:
xpos = sprite_pos.get("x").get(xpos, hooch.pos[0]) xpos = hooch.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
ypos = sprite_pos.get("y").get(ypos, hooch.pos[1]) ypos = hooch.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
hooch.pos = (xpos, ypos) hooch.pos = (xpos, ypos)
redraw = True redraw = True

View File

@ -44,8 +44,8 @@ init python:
layer = luna.layer layer = luna.layer
if xpos is not None or ypos is not None: if xpos is not None or ypos is not None:
xpos = sprite_pos.get("x").get(xpos, luna.pos[0]) xpos = luna.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
ypos = sprite_pos.get("y").get(ypos, luna.pos[1]) ypos = luna.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
luna.pos = (xpos, ypos) luna.pos = (xpos, ypos)
redraw = True redraw = True

View File

@ -43,8 +43,8 @@ init python:
layer = susan.layer layer = susan.layer
if xpos is not None or ypos is not None: if xpos is not None or ypos is not None:
xpos = sprite_pos.get("x").get(xpos, susan.pos[0]) xpos = susan.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
ypos = sprite_pos.get("y").get(ypos, susan.pos[1]) ypos = susan.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
susan.pos = (xpos, ypos) susan.pos = (xpos, ypos)
redraw = True redraw = True

View File

@ -56,8 +56,8 @@ init python:
layer = tonks.layer layer = tonks.layer
if xpos is not None or ypos is not None: if xpos is not None or ypos is not None:
xpos = sprite_pos.get("x").get(xpos, tonks.pos[0]) xpos = tonks.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
ypos = sprite_pos.get("y").get(ypos, tonks.pos[1]) ypos = tonks.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
tonks.pos = (xpos, ypos) tonks.pos = (xpos, ypos)
redraw = True redraw = True

View File

@ -71,7 +71,6 @@ init python:
self.pos = (0, 0) self.pos = (0, 0)
self.zoom = 0.5 self.zoom = 0.5
self.xzoom = 1 self.xzoom = 1
self.align = (0.5, 1.0)
self.modpath = "mods/" + posixpath.normpath(modpath) if modpath else "" self.modpath = "mods/" + posixpath.normpath(modpath) if modpath else ""

View File

@ -480,6 +480,7 @@ label .hermione_skip_intro:
$ states.her.ev.tutoring.unlocked = True $ states.her.ev.tutoring.unlocked = True
$ states.her.favors_unlocked = True $ states.her.favors_unlocked = True
$ states.her.wardrobe_unlocked = True $ states.her.wardrobe_unlocked = True
$ states.paperwork_unlocked = True
# Simulate points gains # Simulate points gains
$ slytherin = gryffindor $ slytherin = gryffindor

View File

@ -72,6 +72,8 @@ label start_dev:
states.cho.ev.intro.e4_complete = True states.cho.ev.intro.e4_complete = True
states.sna.ev.hangouts.cho_e1 = True states.sna.ev.hangouts.cho_e1 = True
states.paperwork_unlocked = True
for i in mirror.items: for i in mirror.items:
i.unlocked = True i.unlocked = True