From 3d73d8c00d37744a36a8536cf272d55db81c44af Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Tue, 2 May 2023 21:14:38 +0100
Subject: [PATCH] Bug fixes

* Fixed regression in sprites positioning method
* Fixed missing paperwork unlock when using quick start
* Removed redundant align attribute from doll class
---
 game/scripts/characters/astoria/common.rpy  | 4 ++--
 game/scripts/characters/cho/common.rpy      | 4 ++--
 game/scripts/characters/hermione/common.rpy | 4 ++--
 game/scripts/characters/hooch/common.rpy    | 4 ++--
 game/scripts/characters/luna/common.rpy     | 4 ++--
 game/scripts/characters/susan/common.rpy    | 4 ++--
 game/scripts/characters/tonks/common.rpy    | 4 ++--
 game/scripts/doll/main.rpy                  | 1 -
 game/scripts/interface/cheats.rpy           | 1 +
 game/scripts/script.rpy                     | 2 ++
 10 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/game/scripts/characters/astoria/common.rpy b/game/scripts/characters/astoria/common.rpy
index 60ade08a..034bc5fe 100644
--- a/game/scripts/characters/astoria/common.rpy
+++ b/game/scripts/characters/astoria/common.rpy
@@ -48,8 +48,8 @@ init python:
         layer = astoria.layer
 
         if xpos is not None or ypos is not None:
-            xpos = sprite_pos.get("x").get(xpos, astoria.pos[0])
-            ypos = sprite_pos.get("y").get(ypos, astoria.pos[1])
+            xpos = astoria.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
+            ypos = astoria.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
             astoria.pos = (xpos, ypos)
             redraw = True
 
diff --git a/game/scripts/characters/cho/common.rpy b/game/scripts/characters/cho/common.rpy
index 694db3cb..23570703 100644
--- a/game/scripts/characters/cho/common.rpy
+++ b/game/scripts/characters/cho/common.rpy
@@ -47,8 +47,8 @@ init python in character:
         layer = renpy.store.cho.layer
 
         if xpos is not None or ypos is not None:
-            xpos = renpy.store.sprite_pos.get("x").get(xpos, renpy.store.cho.pos[0])
-            ypos = renpy.store.sprite_pos.get("y").get(ypos, renpy.store.cho.pos[1])
+            xpos = renpy.store.cho.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
+            ypos = renpy.store.cho.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
             renpy.store.cho.pos = (xpos, ypos)
             redraw = True
 
diff --git a/game/scripts/characters/hermione/common.rpy b/game/scripts/characters/hermione/common.rpy
index 19f217f8..64f8ba2e 100644
--- a/game/scripts/characters/hermione/common.rpy
+++ b/game/scripts/characters/hermione/common.rpy
@@ -42,8 +42,8 @@ init python:
         layer = hermione.layer
 
         if xpos is not None or ypos is not None:
-            xpos = sprite_pos.get("x").get(xpos, hermione.pos[0])
-            ypos = sprite_pos.get("y").get(ypos, hermione.pos[1])
+            xpos = hermione.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
+            ypos = hermione.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
             hermione.pos = (xpos, ypos)
             redraw = True
 
diff --git a/game/scripts/characters/hooch/common.rpy b/game/scripts/characters/hooch/common.rpy
index e1e724ad..13f63ccc 100644
--- a/game/scripts/characters/hooch/common.rpy
+++ b/game/scripts/characters/hooch/common.rpy
@@ -33,8 +33,8 @@ init python:
         layer = hooch.layer
 
         if xpos is not None or ypos is not None:
-            xpos = sprite_pos.get("x").get(xpos, hooch.pos[0])
-            ypos = sprite_pos.get("y").get(ypos, hooch.pos[1])
+            xpos = hooch.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
+            ypos = hooch.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
             hooch.pos = (xpos, ypos)
             redraw = True
 
diff --git a/game/scripts/characters/luna/common.rpy b/game/scripts/characters/luna/common.rpy
index 6b2eb62a..7b382ceb 100644
--- a/game/scripts/characters/luna/common.rpy
+++ b/game/scripts/characters/luna/common.rpy
@@ -44,8 +44,8 @@ init python:
         layer = luna.layer
 
         if xpos is not None or ypos is not None:
-            xpos = sprite_pos.get("x").get(xpos, luna.pos[0])
-            ypos = sprite_pos.get("y").get(ypos, luna.pos[1])
+            xpos = luna.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
+            ypos = luna.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
             luna.pos = (xpos, ypos)
             redraw = True
 
diff --git a/game/scripts/characters/susan/common.rpy b/game/scripts/characters/susan/common.rpy
index 6b01a4c1..d4c9c54b 100644
--- a/game/scripts/characters/susan/common.rpy
+++ b/game/scripts/characters/susan/common.rpy
@@ -43,8 +43,8 @@ init python:
         layer = susan.layer
 
         if xpos is not None or ypos is not None:
-            xpos = sprite_pos.get("x").get(xpos, susan.pos[0])
-            ypos = sprite_pos.get("y").get(ypos, susan.pos[1])
+            xpos = susan.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
+            ypos = susan.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
             susan.pos = (xpos, ypos)
             redraw = True
 
diff --git a/game/scripts/characters/tonks/common.rpy b/game/scripts/characters/tonks/common.rpy
index 6ed6d551..fd313997 100644
--- a/game/scripts/characters/tonks/common.rpy
+++ b/game/scripts/characters/tonks/common.rpy
@@ -56,8 +56,8 @@ init python:
         layer = tonks.layer
 
         if xpos is not None or ypos is not None:
-            xpos = sprite_pos.get("x").get(xpos, tonks.pos[0])
-            ypos = sprite_pos.get("y").get(ypos, tonks.pos[1])
+            xpos = tonks.pos[0] if xpos is None else sprite_pos.get("x").get(xpos, xpos)
+            ypos = tonks.pos[1] if ypos is None else sprite_pos.get("y").get(ypos, ypos)
             tonks.pos = (xpos, ypos)
             redraw = True
 
diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy
index bf708722..72ce386f 100644
--- a/game/scripts/doll/main.rpy
+++ b/game/scripts/doll/main.rpy
@@ -71,7 +71,6 @@ init python:
             self.pos = (0, 0)
             self.zoom = 0.5
             self.xzoom = 1
-            self.align = (0.5, 1.0)
 
             self.modpath = "mods/" + posixpath.normpath(modpath) if modpath else ""
 
diff --git a/game/scripts/interface/cheats.rpy b/game/scripts/interface/cheats.rpy
index 9a40d05b..ab9f0749 100644
--- a/game/scripts/interface/cheats.rpy
+++ b/game/scripts/interface/cheats.rpy
@@ -480,6 +480,7 @@ label .hermione_skip_intro:
     $ states.her.ev.tutoring.unlocked = True
     $ states.her.favors_unlocked = True
     $ states.her.wardrobe_unlocked = True
+    $ states.paperwork_unlocked = True
 
     # Simulate points gains
     $ slytherin = gryffindor
diff --git a/game/scripts/script.rpy b/game/scripts/script.rpy
index fe581935..0954b2ef 100644
--- a/game/scripts/script.rpy
+++ b/game/scripts/script.rpy
@@ -72,6 +72,8 @@ label start_dev:
         states.cho.ev.intro.e4_complete = True
         states.sna.ev.hangouts.cho_e1 = True
 
+        states.paperwork_unlocked = True
+
         for i in mirror.items:
             i.unlocked = True