From e1692960099eb793983171a2d8c3a1fe94454957 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Sun, 11 Dec 2022 19:37:56 +0000
Subject: [PATCH 01/17] Xmas Story

---
 .../mirror/events/genies_christmas_wish.rpy   | 170 ++++++++++++++++++
 game/scripts/minigames/mirror/init.rpy        |  12 ++
 2 files changed, 182 insertions(+)
 create mode 100644 game/scripts/minigames/mirror/events/genies_christmas_wish.rpy

diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
new file mode 100644
index 00000000..848b2a73
--- /dev/null
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -0,0 +1,170 @@
+label genies_christmas_wish_rewards:
+    # TODO: Add rewards
+    return
+
+label genies_christmas_wish:
+
+    # Setup
+    # $ fireplace_OBJ.foreground = "fireplace_fire"
+    # $ phoenix_OBJ.decoration = xmas_phoenix_ITEM
+    # $ owl_OBJ.decoration = xmas_owl_ITEM
+    # $ fireplace_OBJ.decoration = xmas_fireplace_ITEM
+    # $ tonks.equip(ton_outfit_elf)
+    # $ hermione.equip(her_outfit_ribbon)
+
+    # TODO: Add decorations and outfits
+
+    stop weather
+    $ game.daytime = False
+    $ game.weather = "snow"
+    call room("main_room")
+    call play_music("stop")
+    show screen blkfade
+    with d5
+
+    centered "{size=+7}{color=#cbcbcb}Genie's Christmas Wish{/color}{/size}"
+
+    hide screen blkfade
+    with d5
+
+    play weather "sounds/wind_long_loop.ogg" fadein 2 fadeout 2
+    call play_music("anguish")
+
+    nar "It was the season of giving, in the world of sluts and magic."
+    nar "But the genie was alone."
+    nar "It sure was sad and tragic."
+
+    nar "Everyone was gone, as they had left for the Christmas holidays."
+    nar "No one left to see him wank, and to receive his cum on their face."
+
+    nar "No one left to drink with, not a single hole to fuck."
+    nar "Not even a sex doll, no hoovers to provide some suck."
+
+    nar "No teachers, no students, not even an elf."
+    gen "I wish I had that talent... Where you can suck off oneself."
+
+    nar "Sure, why not! A voice said."
+    nar "That's easy enough to do! It's Christmas after all, I'll make your wish come true."
+
+    gen "What?! My wish?!"
+    gen "No, that's not what I want!"
+    nar "Yelled the genie, and the wish spell came to a sudden halt."
+
+    nar "So the voice then asked him if they had understood him wrong."
+    nar "Is this not what you wished for... To suck your own mighty schlong?"
+
+    gen "Of course not, don't be stupid."
+    gen "I was merely following the rhyme."
+    gen "If what I truly wanted came true, this world would be cut in twine."
+
+
+    gen "Such as all men being gone! And for the women to be by my side!"
+    nar "Is this what you want?"
+    gen "No, just let me think..."
+    nar "I guess I'll wait until you decide..."
+
+    gen "Make all women into sluts!"
+    nar "Your wish will now be real!"
+    gen "No, wait!"
+    nar "Not again..."
+    gen "I didn't consider how that would make me feel..."
+
+    gen "If they were already slutty... Then what left is there for me to do?"
+    gen "The journey is just as important, as the act of woo-hoo!"
+
+    nar "Are all genies this indecisive?"
+    gen "Just give me a moment to think..."
+    nar "I've got places to be, you know."
+    gen "Quit stirring up a stink."
+
+    gen "You know what... I yield."
+    nar "What?"
+    gen "You heard what I said."
+    nar "You don't want a wish?"
+    gen "Knowing me, it would surely end up with me dead."
+
+    nar "But I have to grant you something. Or I have to stay here forever."
+    gen "Someone immortal to keep me company!"
+    nar "Now aren't you clever..."
+
+    nar "Is there nothing else that you want?"
+    gen "I wish for you to pick."
+    nar "Yeah, yeah, very funny... Don't be such a dick."
+
+    gen "Did I stutter, go on then. Pick the wish for me."
+    nar "Wait, you're serious?"
+    gen "As serious as I'll ever be."
+
+    nar "Alright then, let me think..."
+    gen "Not so easy now, is it?"
+    gen "Just pick whatever, I don't care. At least I had someone visit."
+
+    nar "I know what you need!"
+    nar "Just close your eyes for a bit."
+    gen "I ain't falling for that."
+    nar "Close your eyes, you little shit."
+
+    gen "You're not my dad."
+    nar "Genie said, but he still followed the command."
+    gen "No I'm not!"
+    nar "His eyes now shut, as they had been sprayed by magic sand."
+
+    gen "My eyes!"
+    nar "He yelled loudly... His vision now impaired."
+    gen "This better not be permanent!"
+    nar "He said, his tone sounding a bit scared."
+
+    nar "But his vision then returned, and he greeted by some new outlines."
+    nar "Two women in his office, and they were looking mighty fine."
+
+    wom1 "How did I get here?"
+    nar "Said one."
+    wom1 "I was just with my mum and dad."
+    nar "Confused and slightly worried, also sounding a bit sad."
+
+    wom2 "Now what is this outfit?"
+    nar "Said the other... Checking out the fit."
+    nar "Then she looked up at genie, who was finding it hard... to admit."
+
+    gen "I can explain!"
+    nar "Said the genie, in a stuttering voice."
+    gen "There was this magic thing... Like a ghost!"
+    gen "I swear I didn't have a choice!"
+
+    nar "The expressions on the women changed to angry and hurt."
+    nar "As they were in the middle of celebrations, what if they missed out on the dessert!"
+
+    nar "They then opened their mouths to give him a piece of their mind."
+    nar "But then the voice showed their presence, and answered their concerns in kind."
+
+    nar "You see your headmaster was lonely... it is Christmas after all."
+    nar "And I felt his heart aching, so I answered his call."
+
+    nar "A wish I then bestowed, so he would not have to feel so grim."
+    nar "But he could not clear his mind, and had me choose for him."
+
+    nar "As it's the season to celebrate, with the ones you love the most--"
+    gen "Love is a strong word."
+    wom2 "Don't mind him... Now, tell us the wish, ghost."
+
+    nar "I brought you two too him, well, a copy of you at least."
+    nar "The other one is still at home, enjoying a Christmas feast."
+
+    nar "The gift I give to you, is not having to choose."
+    nar "Once Christmas is finally over, no memories you will lose."
+
+    nar "The ones you make at home, the ones you make at school."
+    nar "Both will be intact..."
+    nar "Now, isn't that cool?"
+
+    wom2 "A copy of us at home, while we can have sex over here?"
+    wom1 "For how long will it last?"
+    nar "Let's make it the end of the year."
+
+    wom1 "Are you crying, sir?"
+    nar "One of them asked, as a tear escaped genie's eye."
+    gen "A Christmas filled with sex... Now that is enough, to make a grown man cry."
+
+    san2 "Merry Christmas!"
+
+    $ renpy.end_replay()
diff --git a/game/scripts/minigames/mirror/init.rpy b/game/scripts/minigames/mirror/init.rpy
index c0f27e6e..56547e33 100644
--- a/game/scripts/minigames/mirror/init.rpy
+++ b/game/scripts/minigames/mirror/init.rpy
@@ -192,3 +192,15 @@ default mr_ev_BBB = MirrorEvent(
     tags=["Humorous", "Flashing"],
     unlocked=True,
 )
+
+default mr_ev_GCW = MirrorEvent(
+    id="mr_ev_GCW",
+    name="Genie's Christmas Wish",
+    cast=["genie"],
+    desc="",
+    label="genies_christmas_wish",
+    label_rewards="genies_christmas_wish_rewards",
+    authors=["SilverStudioGames"],
+    tags=["Seasonal", "Noir"],
+    unlocked=True,
+)

From f58d18b2ac102621bf89753e130d5c6c5dc927fa Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Mon, 12 Dec 2022 22:08:39 +0100
Subject: [PATCH 02/17] Xmas Story - Posing - Part 1

---
 .../mirror/events/genies_christmas_wish.rpy   | 157 ++++++++++++------
 1 file changed, 105 insertions(+), 52 deletions(-)

diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
index 848b2a73..bbf40f21 100644
--- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -5,6 +5,10 @@ label genies_christmas_wish_rewards:
 label genies_christmas_wish:
 
     # Setup
+
+    #TODO use new xmas deco
+    #TODO equip reindeer outfits
+
     # $ fireplace_OBJ.foreground = "fireplace_fire"
     # $ phoenix_OBJ.decoration = xmas_phoenix_ITEM
     # $ owl_OBJ.decoration = xmas_owl_ITEM
@@ -22,7 +26,7 @@ label genies_christmas_wish:
     show screen blkfade
     with d5
 
-    centered "{size=+7}{color=#cbcbcb}Genie's Christmas Wish{/color}{/size}"
+    #centered "{size=+7}{color=#cbcbcb}Genie's Christmas Wish{/color}{/size}"
 
     hide screen blkfade
     with d5
@@ -34,137 +38,186 @@ label genies_christmas_wish:
     nar "But the genie was alone."
     nar "It sure was sad and tragic."
 
-    nar "Everyone was gone, as they had left for the Christmas holidays."
+    nar "Everyone was gone, as they had left for the holidays."
     nar "No one left to see him wank, and to receive his cum on their face."
 
     nar "No one left to drink with, not a single hole to fuck."
     nar "Not even a sex doll, no hoovers to provide some suck."
 
     nar "No teachers, no students, not even an elf."
-    gen "I wish I had that talent... Where you can suck off oneself."
+    gen "I wish I had that talent... Where you can suck off oneself." ("base", xpos="far_left", ypos="head")
 
     nar "Sure, why not! A voice said."
     nar "That's easy enough to do! It's Christmas after all, I'll make your wish come true."
 
-    gen "What?! My wish?!"
-    gen "No, that's not what I want!"
+    gen "What?! My wish?!" ("angry", xpos="far_left", ypos="head")
+    gen "No, that's not what I want!" ("angry", xpos="far_left", ypos="head")
     nar "Yelled the genie, and the wish spell came to a sudden halt."
 
     nar "So the voice then asked him if they had understood him wrong."
     nar "Is this not what you wished for... To suck your own mighty schlong?"
 
-    gen "Of course not, don't be stupid."
-    gen "I was merely following the rhyme."
-    gen "If what I truly wanted came true, this world would be cut in twine."
+    gen "Of course not, don't be stupid." ("base", xpos="far_left", ypos="head")
+    gen "I was merely following the rhyme." ("base", xpos="far_left", ypos="head")
+    gen "If what I truly wanted came true, this world would be cut in twine." ("base", xpos="far_left", ypos="head")
 
-
-    gen "Such as all men being gone! And for the women to be by my side!"
+    gen "Such as all men being gone! And for the women to be by my side!" ("base", xpos="far_left", ypos="head")
     nar "Is this what you want?"
-    gen "No, just let me think..."
+    gen "No, just let me think..." ("base", xpos="far_left", ypos="head")
     nar "I guess I'll wait until you decide..."
 
-    gen "Make all women into sluts!"
+    gen "Make all women into sluts!" ("grin", xpos="far_left", ypos="head")
     nar "Your wish will now be real!"
-    gen "No, wait!"
+    gen "No, wait!" ("angry", xpos="far_left", ypos="head")
     nar "Not again..."
-    gen "I didn't consider how that would make me feel..."
+    gen "I didn't consider, how that would make me feel..." ("base", xpos="far_left", ypos="head")
 
-    gen "If they were already slutty... Then what left is there for me to do?"
-    gen "The journey is just as important, as the act of woo-hoo!"
+    gen "If they were already slutty... Then what left is there for me to do?" ("base", xpos="far_left", ypos="head")
+    gen "The journey is just as important, as the act of woo-hoo!" ("base", xpos="far_left", ypos="head")
 
     nar "Are all genies this indecisive?"
-    gen "Just give me a moment to think..."
+    gen "Just give me a moment to think..." ("base", xpos="far_left", ypos="head")
     nar "I've got places to be, you know."
-    gen "Quit stirring up a stink."
+    gen "Quit stirring up a stink." ("base", xpos="far_left", ypos="head")
 
-    gen "You know what... I yield."
+    gen "You know what... I yield." ("base", xpos="far_left", ypos="head")
     nar "What?"
-    gen "You heard what I said."
+    gen "You heard what I said." ("base", xpos="far_left", ypos="head")
     nar "You don't want a wish?"
-    gen "Knowing me, it would surely end up with me dead."
+    gen "Knowing me, it would surely end up with me dead." ("base", xpos="far_left", ypos="head")
 
     nar "But I have to grant you something. Or I have to stay here forever."
-    gen "Someone immortal to keep me company!"
+    gen "Someone immortal to keep me company!" ("base", xpos="far_left", ypos="head")
     nar "Now aren't you clever..."
 
     nar "Is there nothing else that you want?"
-    gen "I wish for you to pick."
+    gen "I wish for you to pick." ("base", xpos="far_left", ypos="head")
     nar "Yeah, yeah, very funny... Don't be such a dick."
 
-    gen "Did I stutter, go on then. Pick the wish for me."
+    gen "Did I stutter, go on then. Pick the wish for me." ("base", xpos="far_left", ypos="head")
     nar "Wait, you're serious?"
-    gen "As serious as I'll ever be."
+    gen "As serious as I'll ever be." ("base", xpos="far_left", ypos="head")
 
     nar "Alright then, let me think..."
-    gen "Not so easy now, is it?"
-    gen "Just pick whatever, I don't care. At least I had someone visit."
+    gen "Not so easy now, is it?" ("base", xpos="far_left", ypos="head")
+    gen "Just pick whatever, I don't care. At least I had someone visit." ("base", xpos="far_left", ypos="head")
 
     nar "I know what you need!"
     nar "Just close your eyes for a bit."
-    gen "I ain't falling for that."
+    gen "I ain't falling for that." ("base", xpos="far_left", ypos="head")
     nar "Close your eyes, you little shit."
 
-    gen "You're not my dad."
+    gen "You're not my dad." ("base", xpos="far_left", ypos="head")
     nar "Genie said, but he still followed the command."
-    gen "No I'm not!"
+    gen "No I'm not!" ("base", xpos="far_left", ypos="head")
+
+    show screen blkfade
+    play sound "sounds/woosh.ogg"
+
     nar "His eyes now shut, as they had been sprayed by magic sand."
 
-    gen "My eyes!"
+    gen "My eyes!" ("open", xpos="far_left", ypos="head")
     nar "He yelled loudly... His vision now impaired."
-    gen "This better not be permanent!"
+    gen "This better not be permanent!" ("angry", xpos="far_left", ypos="head")
     nar "He said, his tone sounding a bit scared."
 
-    nar "But his vision then returned, and he greeted by some new outlines."
-    nar "Two women in his office, and they were looking mighty fine."
 
-    wom1 "How did I get here?"
+    $ luna_chibi.zorder = 1
+    $ hermione_chibi.zorder = 2
+    $ cho_chibi.zorder = 3
+    call lun_chibi("stand", 490, 420)
+    call her_chibi("stand", 510, 440)
+    call cho_chibi("stand", 530, 460)
+
+    hide screen blkfade
+    with d3
+
+    nar "But his vision then returned, and he was greeted by some new outlines."
+    nar "Three women in his office, and they were looking mighty fine."
+
+    cho "How did I get here?" ("angry", "wide", "base", "stare", xpos="mid", ypos="base", trans=d5)
     nar "Said one."
-    wom1 "I was just with my mum and dad."
-    nar "Confused and slightly worried, also sounding a bit sad."
+    cho "" ("annoyed", "base", "base", "R")
+    her "I was just with my mum and dad." ("mad", "base", "base", "stare", xpos=500, ypos="base", trans=d5)
+    nar "Said the second, sounding confused, and a bit sad."
 
-    wom2 "Now what is this outfit?"
-    nar "Said the other... Checking out the fit."
+    her "" ("annoyed", "base", "base", "R")
+    lun "Now what is this outfit?" ("soft", "base", "base", "down", xpos="base", ypos="base", trans=d5)
+    nar "Said the third... While checking out the fit."
+    her "" ("angry", "base", "base", "down")
+    cho "" ("clench", "base", "base", "down")
+    lun "" ("soft", "base", "base", "mid")
     nar "Then she looked up at genie, who was finding it hard... to admit."
 
-    gen "I can explain!"
+    nar "Should he lie, or be truthful?"
+    nar "What on earth should he say?"
+    nar "When the truth sounds so unlike him."
+    nar "That he felt alone this Christmas day."
+
+    her "" ("annoyed", "base", "base", "mid")
+    cho "" ("normal", "base", "base", "mid")
+    gen "I can explain!" ("open", xpos="far_left", ypos="head")
     nar "Said the genie, in a stuttering voice."
-    gen "There was this magic thing... Like a ghost!"
-    gen "I swear I didn't have a choice!"
+    gen "There was this magic thing... Like a ghost!" ("angry", xpos="far_left", ypos="head")
 
-    nar "The expressions on the women changed to angry and hurt."
-    nar "As they were in the middle of celebrations, what if they missed out on the dessert!"
+    gen "I swear I didn't have a choice!" ("angry", xpos="far_left", ypos="head")
 
+    her "" ("disgust", "narrow", "base", "mid")
+    lun "" ("annoyed", "base", "base", "mid")
+    cho "" ("angry", "narrow", "angry", "mid")
+    nar "The expressions on the women changed to angry and displeased."
+    nar "As they were in the middle of celebrations, the middle of their Christmas feast!"
+
+    her "" ("open", "narrow", "angry", "mid")
+    lun "" ("open", "base", "worried", "mid")
+    cho "" ("open", "narrow", "angry", "mid")
     nar "They then opened their mouths to give him a piece of their mind."
     nar "But then the voice showed their presence, and answered their concerns in kind."
 
+    her "" ("angry", "base", "base", "R")
+    lun "" ("soft", "base", "base", "L")
+    cho "" ("clench", "narrow", "base", "L")
     nar "You see your headmaster was lonely... it is Christmas after all."
     nar "And I felt his heart aching, so I answered his call."
 
+    her "" ("soft", "base", "base", "mid")
+    lun "" ("soft", "base", "base", "mid")
+    cho "" ("open", "narrow", "base", "mid")
     nar "A wish I then bestowed, so he would not have to feel so grim."
     nar "But he could not clear his mind, and had me choose for him."
 
     nar "As it's the season to celebrate, with the ones you love the most--"
-    gen "Love is a strong word."
-    wom2 "Don't mind him... Now, tell us the wish, ghost."
+    gen "Love is a strong word." ("base", xpos="far_left", ypos="head")
+    cho "Don't mind him... Now, tell us the wish, ghost." ("smile", "base", "base", "mid")
 
-    nar "I brought you two too him, well, a copy of you at least."
+    nar "I brought you three to him, well, a copy of you all at least."
     nar "The other one is still at home, enjoying a Christmas feast."
 
     nar "The gift I give to you, is not having to choose."
+    her "" ("open", "base", "base", "stare")
+    lun "" ("grin", "base", "base", "mid")
     nar "Once Christmas is finally over, no memories you will lose."
 
     nar "The ones you make at home, the ones you make at school."
     nar "Both will be intact..."
     nar "Now, isn't that cool?"
 
-    wom2 "A copy of us at home, while we can have sex over here?"
-    wom1 "For how long will it last?"
+    cho "A copy of us at home, while we can have sex over here?" ("grin", "narrow", "base", "mid")
+    her "For how long will it last?" ("grin", "narrow", "base", "mid")
     nar "Let's make it the end of the year."
 
-    wom1 "Are you crying, sir?"
+    lun "Are you crying, sir?" ("open", "base", "worried", "mid")
     nar "One of them asked, as a tear escaped genie's eye."
-    gen "A Christmas filled with sex... Now that is enough, to make a grown man cry."
+    gen "A Christmas filled with sex... Now that is enough, to make a grown man cry." ("base", xpos="far_left", ypos="head")
 
-    san2 "Merry Christmas!"
+    san4 "The end!"
+
+    show screen blkfade
+    with d4
+
+    cho "Why was I even in this story? We don't even celebrate Christmas at my home."
+    san3 "*Err*..."
+
+    san4 "Merry Christmas!"
 
     $ renpy.end_replay()

From b29701f39c668b622da11d915c16ee3df2193873 Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Wed, 14 Dec 2022 18:32:54 +0100
Subject: [PATCH 03/17] Mirror story posing + outfits

* Posed Xmas Mirror story dialogue

* Added Cho Reindeer Outfit.
* Added Luna Reindeer Outfit.

* Partially added Luna Bunny-girl outfit.
* Partially added Cho Bunny-girl outfit.
* Partially added Hermione Bunny-girl outfit.
* Partially added Hermione Reindeer Outfit.
---
 .../cho/clothes/accessory/mistletoe/0.webp    |  3 +
 .../clothes/accessory/mistletoe/extra.webp    |  3 +
 .../clothes/accessory/mistletoe/outline.webp  |  3 +
 .../cho/clothes/headgear/antlers/0.webp       |  3 +
 .../cho/clothes/headgear/antlers/1.webp       |  3 +
 .../cho/clothes/headgear/antlers/2.webp       |  3 +
 .../cho/clothes/headgear/antlers/outline.webp |  3 +
 .../clothes/neckwear/reindeer_collar/0.webp   |  3 +
 .../clothes/neckwear/reindeer_collar/1.webp   |  3 +
 .../neckwear/reindeer_collar/extra.webp       |  3 +
 .../neckwear/reindeer_collar/outline.webp     |  3 +
 .../cho/clothes/top/bunny_top_1/0.webp        |  3 +
 .../cho/clothes/top/bunny_top_1/extra.webp    |  3 +
 .../cho/clothes/top/bunny_top_1/outline.webp  |  3 +
 .../cho/clothes/top/bunny_top_1/skin.webp     |  3 +
 .../cho/clothes/top/bunny_top_2/0.webp        |  3 +
 .../cho/clothes/top/bunny_top_2/extra.webp    |  3 +
 .../cho/clothes/top/bunny_top_2/outline.webp  |  3 +
 .../cho/clothes/top/bunny_top_2/skin.webp     |  3 +
 .../clothes/accessory/mistletoe/0.webp        |  3 +
 .../clothes/accessory/mistletoe/extra.webp    |  3 +
 .../clothes/accessory/mistletoe/outline.webp  |  3 +
 .../hermione/clothes/top/bunny_top_2/0.webp   |  3 +
 .../clothes/top/bunny_top_2/extra.webp        |  3 +
 .../clothes/top/bunny_top_2/mask.webp         |  3 +
 .../clothes/top/bunny_top_2/outline.webp      |  3 +
 .../clothes/top/bunny_top_2/skin.webp         |  3 +
 .../hermione/clothes/top/bunny_top_3/0.webp   |  3 +
 .../clothes/top/bunny_top_3/extra.webp        |  3 +
 .../clothes/top/bunny_top_3/mask.webp         |  3 +
 .../clothes/top/bunny_top_3/outline.webp      |  3 +
 .../clothes/top/bunny_top_3/skin.webp         |  3 +
 .../luna/clothes/accessory/mistletoe/0.webp   |  3 +
 .../clothes/accessory/mistletoe/extra.webp    |  3 +
 .../clothes/accessory/mistletoe/outline.webp  |  3 +
 .../clothes/earrings/bauble_earring/0.webp    |  3 +
 .../earrings/bauble_earring/extra.webp        |  3 +
 .../earrings/bauble_earring/outline.webp      |  3 +
 .../luna/clothes/headgear/antlers/0.webp      |  3 +
 .../luna/clothes/headgear/antlers/1.webp      |  3 +
 .../luna/clothes/headgear/antlers/2.webp      |  3 +
 .../luna/clothes/headgear/antlers/extra.webp  |  3 +
 .../clothes/headgear/antlers/outline.webp     |  3 +
 .../clothes/neckwear/chocolate_frog/0.webp    |  3 +
 .../neckwear/chocolate_frog/outline.webp      |  3 +
 .../clothes/neckwear/chocolate_frog/skin.webp |  3 +
 .../luna/clothes/top/bunny_top_1/0.webp       |  3 +
 .../luna/clothes/top/bunny_top_1/extra.webp   |  3 +
 .../luna/clothes/top/bunny_top_1/outline.webp |  3 +
 .../luna/clothes/top/bunny_top_1/skin.webp    |  3 +
 .../luna/clothes/top/bunny_top_2/0.webp       |  3 +
 .../luna/clothes/top/bunny_top_2/extra.webp   |  3 +
 .../luna/clothes/top/bunny_top_2/outline.webp |  3 +
 .../luna/clothes/top/bunny_top_2/skin.webp    |  3 +
 game/scripts/characters/cho/wardrobe.rpy      | 20 +++++
 .../characters/cho/wardrobe_reactions.rpy     | 67 ++++++++++++++++
 game/scripts/characters/hermione/wardrobe.rpy | 14 +++-
 .../hermione/wardrobe_reactions.rpy           | 41 ++++++++++
 game/scripts/characters/luna/wardrobe.rpy     | 23 ++++++
 .../characters/luna/wardrobe_reactions.rpy    | 78 +++++++++++++++++++
 .../mirror/events/genies_christmas_wish.rpy   | 21 +++--
 game/scripts/shops/dress/chitchats.rpy        | 17 ++++
 62 files changed, 434 insertions(+), 9 deletions(-)
 create mode 100644 game/characters/cho/clothes/accessory/mistletoe/0.webp
 create mode 100644 game/characters/cho/clothes/accessory/mistletoe/extra.webp
 create mode 100644 game/characters/cho/clothes/accessory/mistletoe/outline.webp
 create mode 100644 game/characters/cho/clothes/headgear/antlers/0.webp
 create mode 100644 game/characters/cho/clothes/headgear/antlers/1.webp
 create mode 100644 game/characters/cho/clothes/headgear/antlers/2.webp
 create mode 100644 game/characters/cho/clothes/headgear/antlers/outline.webp
 create mode 100644 game/characters/cho/clothes/neckwear/reindeer_collar/0.webp
 create mode 100644 game/characters/cho/clothes/neckwear/reindeer_collar/1.webp
 create mode 100644 game/characters/cho/clothes/neckwear/reindeer_collar/extra.webp
 create mode 100644 game/characters/cho/clothes/neckwear/reindeer_collar/outline.webp
 create mode 100644 game/characters/cho/clothes/top/bunny_top_1/0.webp
 create mode 100644 game/characters/cho/clothes/top/bunny_top_1/extra.webp
 create mode 100644 game/characters/cho/clothes/top/bunny_top_1/outline.webp
 create mode 100644 game/characters/cho/clothes/top/bunny_top_1/skin.webp
 create mode 100644 game/characters/cho/clothes/top/bunny_top_2/0.webp
 create mode 100644 game/characters/cho/clothes/top/bunny_top_2/extra.webp
 create mode 100644 game/characters/cho/clothes/top/bunny_top_2/outline.webp
 create mode 100644 game/characters/cho/clothes/top/bunny_top_2/skin.webp
 create mode 100644 game/characters/hermione/clothes/accessory/mistletoe/0.webp
 create mode 100644 game/characters/hermione/clothes/accessory/mistletoe/extra.webp
 create mode 100644 game/characters/hermione/clothes/accessory/mistletoe/outline.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_2/0.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_2/extra.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_2/mask.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_2/outline.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_2/skin.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_3/0.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_3/extra.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_3/mask.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_3/outline.webp
 create mode 100644 game/characters/hermione/clothes/top/bunny_top_3/skin.webp
 create mode 100644 game/characters/luna/clothes/accessory/mistletoe/0.webp
 create mode 100644 game/characters/luna/clothes/accessory/mistletoe/extra.webp
 create mode 100644 game/characters/luna/clothes/accessory/mistletoe/outline.webp
 create mode 100644 game/characters/luna/clothes/earrings/bauble_earring/0.webp
 create mode 100644 game/characters/luna/clothes/earrings/bauble_earring/extra.webp
 create mode 100644 game/characters/luna/clothes/earrings/bauble_earring/outline.webp
 create mode 100644 game/characters/luna/clothes/headgear/antlers/0.webp
 create mode 100644 game/characters/luna/clothes/headgear/antlers/1.webp
 create mode 100644 game/characters/luna/clothes/headgear/antlers/2.webp
 create mode 100644 game/characters/luna/clothes/headgear/antlers/extra.webp
 create mode 100644 game/characters/luna/clothes/headgear/antlers/outline.webp
 create mode 100644 game/characters/luna/clothes/neckwear/chocolate_frog/0.webp
 create mode 100644 game/characters/luna/clothes/neckwear/chocolate_frog/outline.webp
 create mode 100644 game/characters/luna/clothes/neckwear/chocolate_frog/skin.webp
 create mode 100644 game/characters/luna/clothes/top/bunny_top_1/0.webp
 create mode 100644 game/characters/luna/clothes/top/bunny_top_1/extra.webp
 create mode 100644 game/characters/luna/clothes/top/bunny_top_1/outline.webp
 create mode 100644 game/characters/luna/clothes/top/bunny_top_1/skin.webp
 create mode 100644 game/characters/luna/clothes/top/bunny_top_2/0.webp
 create mode 100644 game/characters/luna/clothes/top/bunny_top_2/extra.webp
 create mode 100644 game/characters/luna/clothes/top/bunny_top_2/outline.webp
 create mode 100644 game/characters/luna/clothes/top/bunny_top_2/skin.webp

diff --git a/game/characters/cho/clothes/accessory/mistletoe/0.webp b/game/characters/cho/clothes/accessory/mistletoe/0.webp
new file mode 100644
index 00000000..be042cb3
--- /dev/null
+++ b/game/characters/cho/clothes/accessory/mistletoe/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35eb057ec687645a1d35616dc8464a56f0b1080f69f87e74b693b3a836816fef
+size 1986
diff --git a/game/characters/cho/clothes/accessory/mistletoe/extra.webp b/game/characters/cho/clothes/accessory/mistletoe/extra.webp
new file mode 100644
index 00000000..61f62cf0
--- /dev/null
+++ b/game/characters/cho/clothes/accessory/mistletoe/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2042a2fd3d15c9d4e9ccc8cd6e5ee889a5fa7064d3ba45a5049326ae4c46a3dc
+size 2584
diff --git a/game/characters/cho/clothes/accessory/mistletoe/outline.webp b/game/characters/cho/clothes/accessory/mistletoe/outline.webp
new file mode 100644
index 00000000..77502413
--- /dev/null
+++ b/game/characters/cho/clothes/accessory/mistletoe/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8abd5cab66e51b9a7aa598c032e609a30aa333a8ea1869e84dd255464370dd17
+size 2366
diff --git a/game/characters/cho/clothes/headgear/antlers/0.webp b/game/characters/cho/clothes/headgear/antlers/0.webp
new file mode 100644
index 00000000..709673a7
--- /dev/null
+++ b/game/characters/cho/clothes/headgear/antlers/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92172f2dc078feca04691498153d137805f9e6e1c0d7898401d4319b5c785e7f
+size 3360
diff --git a/game/characters/cho/clothes/headgear/antlers/1.webp b/game/characters/cho/clothes/headgear/antlers/1.webp
new file mode 100644
index 00000000..de6767ca
--- /dev/null
+++ b/game/characters/cho/clothes/headgear/antlers/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3bb0533697416322fd938c8092e0f05e9432b2f787831db035b9b3f24aa2eae
+size 2028
diff --git a/game/characters/cho/clothes/headgear/antlers/2.webp b/game/characters/cho/clothes/headgear/antlers/2.webp
new file mode 100644
index 00000000..07b7d141
--- /dev/null
+++ b/game/characters/cho/clothes/headgear/antlers/2.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2e451a1b18b0449aa6f81c26cf3b1845bf2abdc19a65f5210333d44ddbcab61
+size 5390
diff --git a/game/characters/cho/clothes/headgear/antlers/outline.webp b/game/characters/cho/clothes/headgear/antlers/outline.webp
new file mode 100644
index 00000000..dbd6a2be
--- /dev/null
+++ b/game/characters/cho/clothes/headgear/antlers/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a33716b16893f5db5080a2f8980d3ee96d32c822ed63dad4affe54348a1850d1
+size 8310
diff --git a/game/characters/cho/clothes/neckwear/reindeer_collar/0.webp b/game/characters/cho/clothes/neckwear/reindeer_collar/0.webp
new file mode 100644
index 00000000..8f69f773
--- /dev/null
+++ b/game/characters/cho/clothes/neckwear/reindeer_collar/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75f95acaa27ef005acce0f2e20c26fa3a5ab3513d47262f9e66c4dceefc37c13
+size 2452
diff --git a/game/characters/cho/clothes/neckwear/reindeer_collar/1.webp b/game/characters/cho/clothes/neckwear/reindeer_collar/1.webp
new file mode 100644
index 00000000..7253f000
--- /dev/null
+++ b/game/characters/cho/clothes/neckwear/reindeer_collar/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cd9bf29118b2166ad1c5f12843ad490e328002804f57a787aa278edf0150416
+size 2004
diff --git a/game/characters/cho/clothes/neckwear/reindeer_collar/extra.webp b/game/characters/cho/clothes/neckwear/reindeer_collar/extra.webp
new file mode 100644
index 00000000..cfbfa621
--- /dev/null
+++ b/game/characters/cho/clothes/neckwear/reindeer_collar/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:291241b8e8a6a3834d4b9c19559c3686507207cfe349ca3902ca22b597ad2cf7
+size 1750
diff --git a/game/characters/cho/clothes/neckwear/reindeer_collar/outline.webp b/game/characters/cho/clothes/neckwear/reindeer_collar/outline.webp
new file mode 100644
index 00000000..3b037aef
--- /dev/null
+++ b/game/characters/cho/clothes/neckwear/reindeer_collar/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd50eb13e065bc019602c78e53bdc1f8658c57e5f84a0aa153fb19e18c36ade9
+size 2400
diff --git a/game/characters/cho/clothes/top/bunny_top_1/0.webp b/game/characters/cho/clothes/top/bunny_top_1/0.webp
new file mode 100644
index 00000000..b15c714a
--- /dev/null
+++ b/game/characters/cho/clothes/top/bunny_top_1/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:879be041d95f32277456b616f01a22c6e8dbd568f2a1b5099829346f23bedcfc
+size 12608
diff --git a/game/characters/cho/clothes/top/bunny_top_1/extra.webp b/game/characters/cho/clothes/top/bunny_top_1/extra.webp
new file mode 100644
index 00000000..323c9ae0
--- /dev/null
+++ b/game/characters/cho/clothes/top/bunny_top_1/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:764090f79fe453403d16f75a2460040b06ce61a6dd067f3f611e2828f69caae6
+size 16012
diff --git a/game/characters/cho/clothes/top/bunny_top_1/outline.webp b/game/characters/cho/clothes/top/bunny_top_1/outline.webp
new file mode 100644
index 00000000..fb6734f8
--- /dev/null
+++ b/game/characters/cho/clothes/top/bunny_top_1/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27f8147870d6ed115ff19f05af06f4ef74ed2e482e3afbb52d88215c07330692
+size 9546
diff --git a/game/characters/cho/clothes/top/bunny_top_1/skin.webp b/game/characters/cho/clothes/top/bunny_top_1/skin.webp
new file mode 100644
index 00000000..dc969c52
--- /dev/null
+++ b/game/characters/cho/clothes/top/bunny_top_1/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96aa660d59137b0ca5a42654124c1fc4503f26ed9c5e866cf1a336ca872e5234
+size 4104
diff --git a/game/characters/cho/clothes/top/bunny_top_2/0.webp b/game/characters/cho/clothes/top/bunny_top_2/0.webp
new file mode 100644
index 00000000..4e4de3c0
--- /dev/null
+++ b/game/characters/cho/clothes/top/bunny_top_2/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bac9fc6be2fe5ba67f48ce8977a0ba7ae79d59389dcd4cc5a0f80e0fa659a42b
+size 11940
diff --git a/game/characters/cho/clothes/top/bunny_top_2/extra.webp b/game/characters/cho/clothes/top/bunny_top_2/extra.webp
new file mode 100644
index 00000000..a14f3a83
--- /dev/null
+++ b/game/characters/cho/clothes/top/bunny_top_2/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb8fd05863501b8723a682b6e9642d156814ac738fdfd6dbd89f24465672626c
+size 15690
diff --git a/game/characters/cho/clothes/top/bunny_top_2/outline.webp b/game/characters/cho/clothes/top/bunny_top_2/outline.webp
new file mode 100644
index 00000000..01f988ed
--- /dev/null
+++ b/game/characters/cho/clothes/top/bunny_top_2/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c97c8000a9907c88b1770ebe8dc75fc1b3c9b75ba561db95e94dbac6e668334c
+size 9378
diff --git a/game/characters/cho/clothes/top/bunny_top_2/skin.webp b/game/characters/cho/clothes/top/bunny_top_2/skin.webp
new file mode 100644
index 00000000..ce5d073b
--- /dev/null
+++ b/game/characters/cho/clothes/top/bunny_top_2/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2f1a557957a9fd83d2cb81b26276615bead6331eb57e38e28752493916841f7
+size 4292
diff --git a/game/characters/hermione/clothes/accessory/mistletoe/0.webp b/game/characters/hermione/clothes/accessory/mistletoe/0.webp
new file mode 100644
index 00000000..fea8c2e1
--- /dev/null
+++ b/game/characters/hermione/clothes/accessory/mistletoe/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6d7ea4dddb522ff55f2c0c65c3c440ac6d883edc4209721b852107d585dd1d0
+size 1868
diff --git a/game/characters/hermione/clothes/accessory/mistletoe/extra.webp b/game/characters/hermione/clothes/accessory/mistletoe/extra.webp
new file mode 100644
index 00000000..5d956c4a
--- /dev/null
+++ b/game/characters/hermione/clothes/accessory/mistletoe/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c7d78c4aeb8723cbc5b340e7dbd7418df39e830d73ebdb6e0b3deed3e1f0b02
+size 2688
diff --git a/game/characters/hermione/clothes/accessory/mistletoe/outline.webp b/game/characters/hermione/clothes/accessory/mistletoe/outline.webp
new file mode 100644
index 00000000..fe3ce4b9
--- /dev/null
+++ b/game/characters/hermione/clothes/accessory/mistletoe/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d87ff667af846e9a74c090495c7343fd283a6033bf37ea184c4cfe3bcbaa6f55
+size 2470
diff --git a/game/characters/hermione/clothes/top/bunny_top_2/0.webp b/game/characters/hermione/clothes/top/bunny_top_2/0.webp
new file mode 100644
index 00000000..9172e867
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_2/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:554e2441eff7edb5a3caace414d5ca87483c924cda041f869165bc7962c77954
+size 12398
diff --git a/game/characters/hermione/clothes/top/bunny_top_2/extra.webp b/game/characters/hermione/clothes/top/bunny_top_2/extra.webp
new file mode 100644
index 00000000..c588dc1c
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_2/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2faa53fbd0dd59c06078d0fbb724ee66c70f991894468efc28da13134a740ef3
+size 15062
diff --git a/game/characters/hermione/clothes/top/bunny_top_2/mask.webp b/game/characters/hermione/clothes/top/bunny_top_2/mask.webp
new file mode 100644
index 00000000..7bdb8c66
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_2/mask.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c38dd616480bb9584af125a38e9374a6c179a37377e4ef23a10cdc106af71804
+size 662
diff --git a/game/characters/hermione/clothes/top/bunny_top_2/outline.webp b/game/characters/hermione/clothes/top/bunny_top_2/outline.webp
new file mode 100644
index 00000000..96f9c205
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_2/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f3583d049ca604b8d8fdabde9f868d101a0db2adaaa1e1976a6b72ab8d18528
+size 9244
diff --git a/game/characters/hermione/clothes/top/bunny_top_2/skin.webp b/game/characters/hermione/clothes/top/bunny_top_2/skin.webp
new file mode 100644
index 00000000..7465e6dd
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_2/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8bd85b312991142674e8298b53ff9d983ec72280fb621b7c09cb83b25006759
+size 4612
diff --git a/game/characters/hermione/clothes/top/bunny_top_3/0.webp b/game/characters/hermione/clothes/top/bunny_top_3/0.webp
new file mode 100644
index 00000000..2cd1d987
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_3/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70174f8f8eb8b3bed6a01a8f2f239df824396c55e20e6320d35629020503c500
+size 12038
diff --git a/game/characters/hermione/clothes/top/bunny_top_3/extra.webp b/game/characters/hermione/clothes/top/bunny_top_3/extra.webp
new file mode 100644
index 00000000..a876d502
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_3/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e58aba1b92640e79ff9b7cbe7a757fb04e31bf47ac57445a211f1651b5aa8fc1
+size 14638
diff --git a/game/characters/hermione/clothes/top/bunny_top_3/mask.webp b/game/characters/hermione/clothes/top/bunny_top_3/mask.webp
new file mode 100644
index 00000000..fa92060f
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_3/mask.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc48e9b32e230629f5928948d6c0c0ad86d1806ee308a21f12a98d04d44827cd
+size 674
diff --git a/game/characters/hermione/clothes/top/bunny_top_3/outline.webp b/game/characters/hermione/clothes/top/bunny_top_3/outline.webp
new file mode 100644
index 00000000..85c12745
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_3/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a29e80c80c6255aa7da7e005883854a2d3bf51b3a7493db235b4e725472bad9
+size 9144
diff --git a/game/characters/hermione/clothes/top/bunny_top_3/skin.webp b/game/characters/hermione/clothes/top/bunny_top_3/skin.webp
new file mode 100644
index 00000000..00b7ab91
--- /dev/null
+++ b/game/characters/hermione/clothes/top/bunny_top_3/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35721def3b619a83b24d7855aa4869d317d0ce1f7d14216054bd9fe68760d7b6
+size 4892
diff --git a/game/characters/luna/clothes/accessory/mistletoe/0.webp b/game/characters/luna/clothes/accessory/mistletoe/0.webp
new file mode 100644
index 00000000..5aacf6ce
--- /dev/null
+++ b/game/characters/luna/clothes/accessory/mistletoe/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9184696b2e3053eceed6b00c13472830d94a24abfc2a198e002f6f7defb2b25a
+size 1958
diff --git a/game/characters/luna/clothes/accessory/mistletoe/extra.webp b/game/characters/luna/clothes/accessory/mistletoe/extra.webp
new file mode 100644
index 00000000..f2b94abf
--- /dev/null
+++ b/game/characters/luna/clothes/accessory/mistletoe/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f09da0a6bc9f74c09c49b54462a624d5592b96f89a18c096fed3a0f21f6e828
+size 2688
diff --git a/game/characters/luna/clothes/accessory/mistletoe/outline.webp b/game/characters/luna/clothes/accessory/mistletoe/outline.webp
new file mode 100644
index 00000000..fe3ce4b9
--- /dev/null
+++ b/game/characters/luna/clothes/accessory/mistletoe/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d87ff667af846e9a74c090495c7343fd283a6033bf37ea184c4cfe3bcbaa6f55
+size 2470
diff --git a/game/characters/luna/clothes/earrings/bauble_earring/0.webp b/game/characters/luna/clothes/earrings/bauble_earring/0.webp
new file mode 100644
index 00000000..3349ab2f
--- /dev/null
+++ b/game/characters/luna/clothes/earrings/bauble_earring/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4c09b900c0ffdaa2fa282708e5f1c2756406b37f7951dbfaadc562b9318f450
+size 956
diff --git a/game/characters/luna/clothes/earrings/bauble_earring/extra.webp b/game/characters/luna/clothes/earrings/bauble_earring/extra.webp
new file mode 100644
index 00000000..8bee3476
--- /dev/null
+++ b/game/characters/luna/clothes/earrings/bauble_earring/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:027cec5b675d1a1ebf4eab7c399a8c9e4970bbbf3f7e7133379917dc5485cdcc
+size 5634
diff --git a/game/characters/luna/clothes/earrings/bauble_earring/outline.webp b/game/characters/luna/clothes/earrings/bauble_earring/outline.webp
new file mode 100644
index 00000000..b14b991b
--- /dev/null
+++ b/game/characters/luna/clothes/earrings/bauble_earring/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4fe8014afb5ee731b03b00276a169d43446f978b3ee3cd03df0d27735f0333f
+size 1390
diff --git a/game/characters/luna/clothes/headgear/antlers/0.webp b/game/characters/luna/clothes/headgear/antlers/0.webp
new file mode 100644
index 00000000..a1a4953e
--- /dev/null
+++ b/game/characters/luna/clothes/headgear/antlers/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ac4b614a36a330573092b51fa87da406a7eab15f6bc8b3f95a7e369458d6fc1
+size 3868
diff --git a/game/characters/luna/clothes/headgear/antlers/1.webp b/game/characters/luna/clothes/headgear/antlers/1.webp
new file mode 100644
index 00000000..70c5533d
--- /dev/null
+++ b/game/characters/luna/clothes/headgear/antlers/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f93df8780dd8073eca1872a327865d490764abca52e3f7acca92648acb46d53
+size 1952
diff --git a/game/characters/luna/clothes/headgear/antlers/2.webp b/game/characters/luna/clothes/headgear/antlers/2.webp
new file mode 100644
index 00000000..04fabeaf
--- /dev/null
+++ b/game/characters/luna/clothes/headgear/antlers/2.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42cb0a456503e13f3bc560a479a653514f86e6fd9c2ff93bf66a6a9e11ba4b61
+size 6480
diff --git a/game/characters/luna/clothes/headgear/antlers/extra.webp b/game/characters/luna/clothes/headgear/antlers/extra.webp
new file mode 100644
index 00000000..b96b4b0c
--- /dev/null
+++ b/game/characters/luna/clothes/headgear/antlers/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe2d8b489d60ef5b90cd67dc92f76590082bda435ee54f266cae3db0501f2386
+size 2774
diff --git a/game/characters/luna/clothes/headgear/antlers/outline.webp b/game/characters/luna/clothes/headgear/antlers/outline.webp
new file mode 100644
index 00000000..44920965
--- /dev/null
+++ b/game/characters/luna/clothes/headgear/antlers/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b323474b70aa5cefb8897fcae2a77856a37c8e704534a9f3498cca8046b9d38
+size 10056
diff --git a/game/characters/luna/clothes/neckwear/chocolate_frog/0.webp b/game/characters/luna/clothes/neckwear/chocolate_frog/0.webp
new file mode 100644
index 00000000..9357818b
--- /dev/null
+++ b/game/characters/luna/clothes/neckwear/chocolate_frog/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86be52bdb7547413cafb3ed175a806a798c65de98b40849e0b974c47d187de65
+size 34
diff --git a/game/characters/luna/clothes/neckwear/chocolate_frog/outline.webp b/game/characters/luna/clothes/neckwear/chocolate_frog/outline.webp
new file mode 100644
index 00000000..3cc72002
--- /dev/null
+++ b/game/characters/luna/clothes/neckwear/chocolate_frog/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8edcccc31e7b09836dfc123c7edb5f742b750fe9f04ba739693d746ba67facad
+size 10164
diff --git a/game/characters/luna/clothes/neckwear/chocolate_frog/skin.webp b/game/characters/luna/clothes/neckwear/chocolate_frog/skin.webp
new file mode 100644
index 00000000..46a59c56
--- /dev/null
+++ b/game/characters/luna/clothes/neckwear/chocolate_frog/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76216dd403f973ed6e03ce7e2b86abb0020fc0dee66cf7d34691563c5b6f8d2b
+size 1660
diff --git a/game/characters/luna/clothes/top/bunny_top_1/0.webp b/game/characters/luna/clothes/top/bunny_top_1/0.webp
new file mode 100644
index 00000000..5da6b9d4
--- /dev/null
+++ b/game/characters/luna/clothes/top/bunny_top_1/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f0dfe2bee88fbf25eed3cefdf9e6b689faeeef366ce530a25f7861cf5abbab6
+size 12214
diff --git a/game/characters/luna/clothes/top/bunny_top_1/extra.webp b/game/characters/luna/clothes/top/bunny_top_1/extra.webp
new file mode 100644
index 00000000..2e7e2758
--- /dev/null
+++ b/game/characters/luna/clothes/top/bunny_top_1/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fef7aecdde450cace28b0d515fe3aef80e11ed1df28eef07a474959d1960592
+size 14782
diff --git a/game/characters/luna/clothes/top/bunny_top_1/outline.webp b/game/characters/luna/clothes/top/bunny_top_1/outline.webp
new file mode 100644
index 00000000..457ff8c7
--- /dev/null
+++ b/game/characters/luna/clothes/top/bunny_top_1/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca7c501f120ebfc70bba8dcb089ebdc02509dd1ab328c39519de6eb8fb547f34
+size 9338
diff --git a/game/characters/luna/clothes/top/bunny_top_1/skin.webp b/game/characters/luna/clothes/top/bunny_top_1/skin.webp
new file mode 100644
index 00000000..dc4733a0
--- /dev/null
+++ b/game/characters/luna/clothes/top/bunny_top_1/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eeb4d674c7c316db5e07863196081c49170971eeb74e0dd7693e84323258f1fb
+size 4650
diff --git a/game/characters/luna/clothes/top/bunny_top_2/0.webp b/game/characters/luna/clothes/top/bunny_top_2/0.webp
new file mode 100644
index 00000000..ae20936c
--- /dev/null
+++ b/game/characters/luna/clothes/top/bunny_top_2/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db9954432e2ed082d28bf4a3415eeb1bf85c7efc4540bca6cd4f7946a821bc1a
+size 11528
diff --git a/game/characters/luna/clothes/top/bunny_top_2/extra.webp b/game/characters/luna/clothes/top/bunny_top_2/extra.webp
new file mode 100644
index 00000000..7195dda1
--- /dev/null
+++ b/game/characters/luna/clothes/top/bunny_top_2/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09167ef7c1e4da99c4f785cea02bd2815ef3a2743556a366073758917ace8f20
+size 14318
diff --git a/game/characters/luna/clothes/top/bunny_top_2/outline.webp b/game/characters/luna/clothes/top/bunny_top_2/outline.webp
new file mode 100644
index 00000000..a258ac7b
--- /dev/null
+++ b/game/characters/luna/clothes/top/bunny_top_2/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e5a7421eb25dfbce1913a92fce677441641ef47a16fea2dbdbbaaf7a6370b96
+size 9110
diff --git a/game/characters/luna/clothes/top/bunny_top_2/skin.webp b/game/characters/luna/clothes/top/bunny_top_2/skin.webp
new file mode 100644
index 00000000..bcc01411
--- /dev/null
+++ b/game/characters/luna/clothes/top/bunny_top_2/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6fff8ee0139fba166cc6a68574562398c3233858d57e4ad674f1fa48d6d8369
+size 5042
diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy
index a037b31d..cd0848a8 100644
--- a/game/scripts/characters/cho/wardrobe.rpy
+++ b/game/scripts/characters/cho/wardrobe.rpy
@@ -206,6 +206,26 @@ default cho_headgear_police_cap = DollCloth("cho", ("head", "headgear"), "headge
 
 default cho_outfit_police = DollOutfit([cho_hair_ponytail1, cho_top_police1, cho_bottom_police_skirt, cho_bra_basic1, cho_panties_basic1, cho_glasses_aviators, cho_headgear_police_cap])
 
+######################
+## Reindeer Costume ##
+######################
+
+default cho_top_bunny2 = DollCloth("cho", ("upper body", "one-piece suits"), "top", "bunny_top_2", [[132, 34, 11, 255]], blacklist=["panties", "bra"], zorder=7, level=15)
+default cho_hat_antlers = DollCloth("cho", ("head", "headgear"), "headgear", "antlers", [[152, 75, 48, 255], [255, 255, 255, 255], [194, 157, 99, 255]])
+default cho_neckwear_reindeer_collar = DollCloth("cho", ("head", "neckwear"), "neckwear", "reindeer_collar", [[126, 68, 34, 255], [196, 171, 95, 255]])
+default cho_accessory3_mistletoe = DollCloth("cho", ("misc", "accessory"), "accessory3", "mistletoe", [[27, 92, 201, 255]], zorder=16, level=5)
+
+default cho_outfit_reindeer = DollOutfit([cho_hair_ponytail1, cho_top_bunny2, cho_accessory3_mistletoe, cho_hat_antlers, cho_neckwear_reindeer_collar])
+
+###################
+## Bunny Costume ##
+###################
+
+default cho_top_bunny1 = DollCloth("cho", ("upper body", "one-piece suits"), "top", "bunny_top_1", [[0, 0, 0, 255]], blacklist=["panties", "bra"], zorder=7, level=15)
+
+#Todo ADD ears
+default cho_outfit_bunny = DollOutfit([cho_hair_ponytail1, cho_top_bunny1], price=250, name="Sexy Bunny Costume", desc="A costume to turn you into the bunny equivalent of a neko.")
+
 ###########
 ## Other ##
 ###########
diff --git a/game/scripts/characters/cho/wardrobe_reactions.rpy b/game/scripts/characters/cho/wardrobe_reactions.rpy
index c9e05e9e..5c9071f0 100644
--- a/game/scripts/characters/cho/wardrobe_reactions.rpy
+++ b/game/scripts/characters/cho/wardrobe_reactions.rpy
@@ -532,6 +532,32 @@ label cho_reaction_equip_outfit(item):
         gen "Sure!" ("base", xpos="far_left", ypos="head")
         cho "Alright then... If you say so." ("base", "base", "base", "mid")
 
+    ###################
+    ## Bunny Costume ##
+    ###################
+    elif item == cho_outfit_bunny: #req 15 (no bra, no panties)
+        gen "I've got this bunny costume for you to put on." ("base", xpos="far_left", ypos="head")
+        cho "A bunny costume?" ("soft", "base", "base", "mid")
+        cho "Do you really think a bunny costume would suit me?" ("open", "base", "base", "R", cheeks="blush")
+        gen "Of course! Why wouldn't it?" ("base", xpos="far_left", ypos="head")
+        cho "Well, I thought that you'd need bigger--" ("upset", "narrow", "base", "down", cheeks="blush")
+        cho "I mean, of course it will suit me!" ("angry", "closed", "angry", "mid", cheeks="blush")
+        cho "Hand it over!" ("angry", "base", "base", "mid", cheeks="blush")
+
+    ######################
+    ## Reindeer Costume ##
+    ######################
+    elif item == cho_outfit_reindeer: #req 15 (no bra, no panties)
+        gen "How about you put on this reindeer costume for me?" ("base", xpos="far_left", ypos="head")
+        cho "A reindeer costume?" ("soft", "base", "raised", "mid")
+        gen "That's right. This one right here..." ("base", xpos="far_left", ypos="head")
+        cho "*Hmm*... I suppose I could--" ("soft", "narrow", "base", "down")
+        cho "Hold on, there's a--" ("clench", "narrow", "base", "down")
+        cho "{size=-4}There's a hole in this...{/size}" ("base", "narrow", "base", "down", cheeks="blush")
+        gen "Something wrong?" ("base", xpos="far_left", ypos="head")
+        cho "I'm fine, let me just put it on..." ("soft", "narrow", "base", "down", cheeks="blush")
+        cho "" ("soft", "narrow", "base", "mid", cheeks="blush")
+
     # TODO: Blacklist fallbacks have to be added.
     return
 
@@ -878,6 +904,47 @@ label cho_reaction_equip_outfit_fail(item):
             cho "..." ("disgust", "base", "angry", "mid")
             gen "Alright then... Maybe some other time." ("base", xpos="far_left", ypos="head")
 
+    ###################
+    ## Bunny Costume ##
+    ###################
+    elif item == cho_outfit_bunny: #req 15 (no bra, no panties)
+        gen "How about you take the leap and wear something that shows off your figure for a change?" ("base", xpos="far_left", ypos="head")
+        cho "What?!" ("disgust", "base", "base", "mid")
+        gen "A bunny costume!" ("grin", xpos="far_left", ypos="head")
+        gen "Get it? Take the leap?" ("grin", xpos="far_left", ypos="head")
+        cho "..." ("disgust", "base", "base", "stare")
+        gen "Cause that's what bunnies do." ("base", xpos="far_left", ypos="head")
+        gen "Well, technically they hop, but--" ("base", xpos="far_left", ypos="head")
+        cho "I sincerely hope you're joking..." ("open", "narrow", "angry", "mid")
+        gen "Yes, so why aren't anyone laughing?" ("base", xpos="far_left", ypos="head")
+        cho "Oh... Thank Merlin..." ("disgust", "closed", "worried", "mid")
+        gen "..." ("base", xpos="far_left", ypos="head")
+        cho "..." ("base", "base", "base", "mid")
+        gen "(Wait...)" ("base", xpos="far_left", ypos="head")
+
+    ######################
+    ## Reindeer Costume ##
+    ######################
+    elif item == cho_outfit_reindeer: #req 15 (no bra, no panties)
+        gen "What do you say about putting on this reindeer costume?" ("base", xpos="far_left", ypos="head")
+        cho "A reindeer costume? Is this like a Christmas thing?" ("soft", "base", "raised", "mid")
+        gen "Something like that." ("base", xpos="far_left", ypos="head")
+        gen "Here you go." ("base", xpos="far_left", ypos="head")
+        cho "Well, that's kind of-- Hold on..." ("angry", "narrow", "base", "down")
+        cho "There's a hole in the crotch!" ("mad", "base", "base", "mid", cheeks="blush")
+        gen "Oh, really?" ("base", xpos="far_left", ypos="head")
+        cho "Surely you're not expecting--" ("angry", "base", "angry", "mid", cheeks="blush")
+        gen "Of course not! It must've happened during shipping!" ("angry", xpos="far_left", ypos="head")
+        gen "Those bloody owls and their claws!" ("angry", xpos="far_left", ypos="head")
+        cho "If Owls did that, then what's up with the mistletoe right above it?!" ("annoyed", "narrow", "angry", "mid")
+        gen "*Err*... I asked for it to be the centrepiece, so they must've thought I meant the centre of the costume!" ("angry", xpos="far_left", ypos="head")
+        cho "Then shouldn't it be on the stomach?" ("open", "narrow", "angry", "mid")
+        cho "Hold on... I can see the seams around this hole, no owl could--" ("angry", "base", "base", "mid")
+        gen "Let me see!" ("open", xpos="far_left", ypos="head")
+        gen "Oh, you're right!" ("angry", xpos="far_left", ypos="head")
+        gen "This isn't at all what I asked for!" ("angry", xpos="far_left", ypos="head")
+        gen "I'm going to have to give that seamstress a piece of my mind!" ("angry", xpos="far_left", ypos="head")
+        cho "..." ("disgust", "narrow", "base", "mid")
     else:
         $ random_number = renpy.random.randint(1, 5)
         if random_number == 1:
diff --git a/game/scripts/characters/hermione/wardrobe.rpy b/game/scripts/characters/hermione/wardrobe.rpy
index 3432957d..6f429ba5 100644
--- a/game/scripts/characters/hermione/wardrobe.rpy
+++ b/game/scripts/characters/hermione/wardrobe.rpy
@@ -150,13 +150,25 @@ default her_outfit_poker = DollOutfit([her_hair_base, her_hat_poker1, her_hat_po
 ##################
 
 default her_top_bunny1 = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "bunny_top_1", [[48, 48, 48, 255]], blacklist=["panties", "bra"], zorder=7, level=19)
+default her_top_bunny2 = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "bunny_top_2", [[0, 0, 0, 255]], blacklist=["panties", "bra"], zorder=7, level=19)
 default her_stockings_bunny1 = DollCloth("hermione", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], level=19)
 default her_tattoo3_bunny1 = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo3", "bunny_tattoo1", [[0, 0, 1, 255]])
 default her_hat_bunny1 = DollCloth("hermione", ("head", "headgear"), "headgear", "bunny_hat_1", [[48, 48, 48, 255], [232, 232, 232, 255]], level=13)
 default her_gloves_bunny1 = DollCloth("hermione", ("upper body", "gloves"), "gloves", "bunny_gloves_1", [[232, 232, 232, 255]], level=4)
 default her_neckwear_bunny1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "bunny_bowtie_1", [[232, 232, 232, 255], [48, 48, 48, 255]], level=4)
+#TODO replace with new ears
 
-default her_outfit_bunny = DollOutfit([her_hair_base, her_top_bunny1, her_stockings_bunny1, her_tattoo3_bunny1, her_hat_bunny1, her_gloves_bunny1, her_neckwear_bunny1], price=350, name="Sexy Bunny Costume", desc="What's up doc?")
+default her_outfit_bunny = DollOutfit([her_hair_base, her_top_bunny2, her_stockings_bunny1, her_tattoo3_bunny1, her_hat_bunny1, her_gloves_bunny1, her_neckwear_bunny1], addons=[her_top_bunny1], price=350, name="Sexy Bunny Costume", desc="What's up doc?")
+
+######################
+## Reindeer Costume ##
+######################
+
+#TODO add antlers
+default her_top_bunny3 = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "bunny_top_3", [[138, 75, 4, 255]], blacklist=["panties", "bra"], zorder=7, level=19)
+default her_accessory3_mistletoe = DollCloth("hermione", ("misc", "accessory"), "accessory3", "mistletoe", [[200, 32, 0, 255]], zorder=16, level=7)
+
+default her_outfit_reindeer = DollOutfit([her_hair_base, her_top_bunny3, her_accessory3_mistletoe, her_stockings_bunny1])
 
 ################
 ## Ball Dress ##
diff --git a/game/scripts/characters/hermione/wardrobe_reactions.rpy b/game/scripts/characters/hermione/wardrobe_reactions.rpy
index 8c42a488..75508035 100644
--- a/game/scripts/characters/hermione/wardrobe_reactions.rpy
+++ b/game/scripts/characters/hermione/wardrobe_reactions.rpy
@@ -1079,6 +1079,20 @@ label her_reaction_equip_outfit(item):
             gen "Just put the thing on." ("base", xpos="far_left", ypos="head")
             her "Alright..." ("open", "narrow", "base", "down", cheeks="blush")
 
+    ######################
+    ## Reindeer Costume ##
+    ######################
+    elif item == her_outfit_reindeer: #Req 19 (top, stockings)
+        gen "I've got this reindeer costume for you to wear." ("base", xpos="far_left", ypos="head")
+        her "You want me to dress up like a reindeer?" ("soft", "base", "base", "mid")
+        gen "Of course, 'Tis the season after all." ("base", xpos="far_left", ypos="head")
+        her "I just thought that you'd want me to wear something... You know..." ("annoyed", "base", "base", "R")
+        gen "Here's the costume." ("base", xpos="far_left", ypos="head")
+        her "Oh, Now it makes sense..." ("open", "narrow", "base", "down", cheeks="blush")
+        gen "So you'll wear it?" ("base", xpos="far_left", ypos="head")
+        her "If wearing it is what you want me to do..." ("soft", "narrow", "base", "R", cheeks="blush")
+        gen "Yes please!" ("base", xpos="far_left", ypos="head")
+
     ###############################
     ## Poker Outfit (token shop) ##
     ###############################
@@ -1932,6 +1946,33 @@ label her_reaction_equip_outfit_fail(item):
             her "*Hmm*... I think I'll pass." ("angry", "closed", "base", "mid", cheeks="blush")
             her "" ("normal", "squint", "base", "R", cheeks="blush")
 
+    ######################
+    ## Reindeer Costume ##
+    ######################
+    elif item == her_outfit_reindeer: #Req 19 (top, stockings)
+        if her_whoring < 4:
+            gen "Ever considered dressing up like a reindeer?" ("base", xpos="far_left", ypos="head")
+            her "Why on earth would I consider doing something like that?" ("open", "base", "base", "mid")
+            gen "No reason..." ("base", xpos="far_left", ypos="head")
+        else: # < 13
+            gen "Put on this reindeer costume for me will you?" ("base", xpos="far_left", ypos="head")
+            her "A reindeer costume?" ("soft", "base", "base", "mid")
+            gen "Yep, this one right here." ("base", xpos="far_left", ypos="head")
+            her "Looks-- Hold on, there's a hole in it!" ("angry", "narrow", "base", "down")
+            gen "Of course there is, how else would you be able to wear it?" ("base", xpos="far_left", ypos="head")
+            her "Not that kind of hole, there's a hole in the-- the--" ("angry", "narrow", "base", "mid")
+            gen "Let me see." ("base", xpos="far_left", ypos="head")
+            gen "Oh, would you look at that." ("base", xpos="far_left", ypos="head")
+            gen "Must be some kind of manufacturing error... Those darn elves, I tell you..." ("base", xpos="far_left", ypos="head")
+            her "House elves made this?!" ("open", "narrow", "angry", "mid")
+            gen "Santa's elves, house elves, is there a difference?" ("base", xpos="far_left", ypos="head")
+            her "..." ("annoyed", "narrow", "angry", "mid")
+            gen "*Err*... It was a joke, since it's a Christmas costume. Of course elves didn't make it!" ("angry", xpos="far_left", ypos="head")
+            her "..." ("disgust", "narrow", "angry", "mid")
+            gen "I mean, if elves had made it, I'm sure they wouldn't have missed this giant hole." ("base", xpos="far_left", ypos="head")
+            her "*Sigh*..." ("disgust", "narrow", "angry", "R")
+            gen "(Crisis averted)." ("base", xpos="far_left", ypos="head")
+
     ###############################
     ## Poker Outfit (token shop) ##
     ###############################
diff --git a/game/scripts/characters/luna/wardrobe.rpy b/game/scripts/characters/luna/wardrobe.rpy
index 52889fc5..a8bc87e0 100644
--- a/game/scripts/characters/luna/wardrobe.rpy
+++ b/game/scripts/characters/luna/wardrobe.rpy
@@ -162,6 +162,29 @@ default lun_top_summer_top2 = DollCloth("luna", ("upper body", "shirts"), "top",
 default lun_bottom_summer_shorts = DollCloth("luna", ("lower body", "shorts"), "bottom", "summer_shorts", [[47, 150, 136, 255], [175, 220, 191, 255], [247, 152, 38 , 255]])
 default lun_accessory2_bracelets = DollCloth("luna", ("misc", "accessory"), "accessory2", "bracelets", [[36, 184, 45, 255], [58, 176, 212, 255], [194, 49, 15]], zorder=22)
 
+######################
+## Reindeer Costume ##
+######################
+
+default lun_top_bunny2 = DollCloth("luna", ("upper body", "one-piece suits"), "top", "bunny_top_2", [[142, 74, 10, 255]], blacklist=["panties", "bra"], zorder=7, level=7)
+default lun_neckwear_chocolate_frog = DollCloth("luna", ("misc", "neckwear"), "neckwear", "chocolate_frog", [[255, 255, 255, 255]])
+default lun_earring_bauble = DollCloth("luna", ("head", "earrings"), "earrings", "bauble_earring", [[163, 0, 0, 255]], level=4)
+default lun_hat_antlers = DollCloth("luna", ("head", "headgear"), "headgear", "antlers", [[142, 74, 10, 255], [255, 255, 255, 255], [219, 192, 149, 255]])
+default lun_accessory3_mistletoe = DollCloth("luna", ("misc", "accessory"), "accessory3", "mistletoe", [[191, 191, 86, 255]], zorder=16, level=7)
+
+default lun_outfit_reindeer = DollOutfit([lun_hair_base, lun_top_bunny2, lun_neckwear_chocolate_frog, lun_earring_bauble, lun_hat_antlers, lun_stockings_pantyhose_meshed])
+
+###########
+## Bunny ##
+###########
+
+#Todo ADD ears
+default lun_top_bunny1 = DollCloth("luna", ("upper body", "one-piece suits"), "top", "bunny_top_1", [[0, 0, 0, 255]], blacklist=["panties", "bra"], zorder=7, level=7)
+
+#TODO ADD ears
+default lun_outfit_bunny = DollOutfit([lun_hair_base, lun_top_bunny1, lun_stockings_pantyhose_meshed], price=250, name="Sexy Bunny Costume", desc="A bunny costume for when you're hopping mad.")
+
+
 #################
 ## Accessories ##
 #################
diff --git a/game/scripts/characters/luna/wardrobe_reactions.rpy b/game/scripts/characters/luna/wardrobe_reactions.rpy
index 248797f5..6bba0856 100644
--- a/game/scripts/characters/luna/wardrobe_reactions.rpy
+++ b/game/scripts/characters/luna/wardrobe_reactions.rpy
@@ -525,6 +525,43 @@ label lun_reaction_equip_outfit(item):
         gen "Just put it on will you?" ("base", xpos="far_left", ypos="head")
         lun "Alright." ("base", "base", "base", "mid")
 
+    ###################
+    ## Bunny Costume ##
+    ###################
+    elif item == lun_outfit_bunny: #Req 7 (No underwear)
+        gen "Put on this bunny costume for me, will you?" ("base", xpos="far_left", ypos="head")
+        lun "A bunny!" ("smile", "base", "base", "stare")
+        lun "I love bunnies!" ("smile", "happyCl", "base", "mid")
+        gen "Great!" ("grin", xpos="far_left", ypos="head")
+        lun "They're so cute--" ("grin", "happyCl", "base", "mid")
+        gen "So you'll--" ("base", xpos="far_left", ypos="head")
+        lun "So fluffy--" ("grin", "happyCl", "base", "mid")
+        gen "I'm glad you--" ("base", xpos="far_left", ypos="head")
+        lun "And I love when they hug your leg!" ("smile", "base", "base", "mid")
+        gen "...{w=0.2} I don't think--" ("base", xpos="far_left", ypos="head")
+        lun "Even my patronus is shaped like a hare!" ("smile", "narrow", "base", "mid")
+        gen "Just put on the costume, will you?" ("base", xpos="far_left", ypos="head")
+        lun "Okay!" ("grin", "base", "base", "mid")
+
+    ######################
+    ## Reindeer Costume ##
+    ######################
+    elif item ==lun_outfit_reindeer: #Req 7 (No underwear)
+        gen "Put on this reindeer costume for me, will you?" ("base", xpos="far_left", ypos="head")
+        lun "A Christmas reindeer costume!" ("grin", "base", "base", "mid")
+        gen "That's right!" ("base", xpos="far_left", ypos="head")
+        lun "Hold on!" ("angry", "base", "base", "mid")
+        lun "There's a hole with a mistletoe above it!" ("clench", "base", "base", "mid")
+        gen "So?" ("base", xpos="far_left", ypos="head")
+        lun "That's where the nargles likes to hide!" ("angry", "base", "worried", "mid")
+        lun "I can't wear this!" ("angry", "happyCl", "worried", "mid")
+        gen "Bloody--" ("base", xpos="far_left", ypos="head")
+        lun "Unless..." ("mad", "base", "base", "stare")
+        gen "Unless?" ("base", xpos="far_left", ypos="head")
+        lun "Are you implying that the hole will draw in the wrackspurts, just so the nargles could ambush them?" ("angry", "base", "base", "mid")
+        gen "*Err*... Sure!" ("base", xpos="far_left", ypos="head")
+        lun "That's brilliant!" ("smile", "base", "base", "mid")
+        lun "Let me put it on." ("grin", "base", "base", "mid")
     # TODO: Blacklist fallbacks have to be added.
     return
 
@@ -731,6 +768,47 @@ label lun_reaction_equip_outfit_fail(item):
         gen "(And here I thought she wanted some hands on experience.)" ("base", xpos="far_left", ypos="head")
         lun "(Can't let those wrackspurts get to me...)" ("disgust", "narrow", "base", "R")
 
+    ###################
+    ## Bunny Costume ##
+    ###################
+    elif item == lun_outfit_bunny: #Req 7 (No Underwear)
+        gen "I've got this bunny costume for you to wear." ("base", xpos="far_left", ypos="head")
+        lun "Oooooh! I love bunnies!" ("grin", "base", "base", "mid")
+        gen "Great, here you go!" ("grin", xpos="far_left", ypos="head")
+        lun "Hold on... Is this everything?" ("angry", "base", "base", "mid")
+        gen "*Err*... Yes?" ("base", xpos="far_left", ypos="head")
+        lun "But, there are no paws!" ("clench", "base", "base", "mid")
+        gen "Paws?" ("base", xpos="far_left", ypos="head")
+        lun "Yes! And no whiskers either!" ("angry", "base", "base", "mid")
+        gen "No--{w=0.2} It's not that kind of a costume!" ("base", xpos="far_left", ypos="head")
+        lun "Oh..." ("upset", "narrow", "worried", "down")
+        gen "So, will you--" ("base", xpos="far_left", ypos="head")
+        lun "*Sigh*..." ("upset", "narrow", "worried", "down") #Sad
+        gen "(I'll just ask again some other time...)" ("base", xpos="far_left", ypos="head")
+
+    ######################
+    ## Reindeer Costume ##
+    ######################
+    elif item == lun_outfit_reindeer: #Req 7 (No Underwear)
+        gen "I've got this reindeer costume for you to wear." ("base", xpos="far_left", ypos="head")
+        lun "Oh! Like a Christmas reindeer!" ("grin", "base", "raised", "mid")
+        gen "Well, I don't think the existence of the animal relies on the holiday--" ("base", xpos="far_left", ypos="head")
+        lun "..." ("grin", "base", "base", "mid")
+        gen "Yes, like a Christmas reindeer..." ("base", xpos="far_left", ypos="head")
+        lun "Yay!" ("smile", "happyCl", "base", "mid")
+        lun "Let me see the costume!" ("smile", "base", "base", "mid")
+        gen "Here you go!" ("base", xpos="far_left", ypos="head")
+        lun "Ooh! This is so--" ("grin", "narrow", "base", "down")
+        lun "Hold on! There's a hole in it!" ("clench", "narrow", "base", "down")
+        gen "Yes, but it's meant to be--" ("base", xpos="far_left", ypos="head")
+        lun "I can't wear this." ("angry", "base", "base", "mid")
+        gen "What! Why not?" ("base", xpos="far_left", ypos="head")
+        lun "If your clothing's got a hole, you should make sure to return it for refund or replacement!" ("open", "closed", "base", "mid")
+        lun "That's what my dad always told me!" ("grin", "base", "base", "mid")
+        gen "..." ("base", xpos="far_left", ypos="head")
+        gen "(I am not going to attempt explaining this to her now...)" ("base", xpos="far_left", ypos="head")
+        gen "(Maybe she'll forget about it later...)" ("base", xpos="far_left", ypos="head")
+
     else:
         lun "This outfit seems to have wrackspurts all over it!" ("mad", "base", "base", "down")
         gen "(I don't remember cumming on this piece of garment...)" ("base", xpos="far_left", ypos="head")
diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
index bbf40f21..62b770e2 100644
--- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -1,22 +1,27 @@
 label genies_christmas_wish_rewards:
-    # TODO: Add rewards
+
+    if not her_outfit_reindeer.unlocked:
+        call unlock_clothing(text=">New clothing items for Hermione have been unlocked!", item=her_outfit_reindeer)
+        call unlock_clothing(text=">New clothing items for Cho have been unlocked!", item=cho_outfit_reindeer)
+        call unlock_clothing(text=">New clothing items for Luna have been unlocked!", item=lun_outfit_reindeer)
+
+    # TODO: Add Decoration rewards
+
     return
 
 label genies_christmas_wish:
 
     # Setup
 
-    #TODO use new xmas deco
-    #TODO equip reindeer outfits
+    #TODO Add decorations
 
     # $ fireplace_OBJ.foreground = "fireplace_fire"
     # $ phoenix_OBJ.decoration = xmas_phoenix_ITEM
     # $ owl_OBJ.decoration = xmas_owl_ITEM
     # $ fireplace_OBJ.decoration = xmas_fireplace_ITEM
-    # $ tonks.equip(ton_outfit_elf)
-    # $ hermione.equip(her_outfit_ribbon)
-
-    # TODO: Add decorations and outfits
+    $ hermione.equip(her_outfit_reindeer)
+    $ cho.equip(cho_outfit_reindeer)
+    $ luna.equip(lun_outfit_reindeer)
 
     stop weather
     $ game.daytime = False
@@ -26,7 +31,7 @@ label genies_christmas_wish:
     show screen blkfade
     with d5
 
-    #centered "{size=+7}{color=#cbcbcb}Genie's Christmas Wish{/color}{/size}"
+    centered "{size=+7}{color=#cbcbcb}Genie's Christmas Wish{/color}{/size}"
 
     hide screen blkfade
     with d5
diff --git a/game/scripts/shops/dress/chitchats.rpy b/game/scripts/shops/dress/chitchats.rpy
index 6b595e18..116f7320 100644
--- a/game/scripts/shops/dress/chitchats.rpy
+++ b/game/scripts/shops/dress/chitchats.rpy
@@ -400,6 +400,16 @@ label purchase_outfit(item):
         maf "Nothing... So you want an outfit made from this game?"
         gen "I... Yes, something Chun-Li inspired if you please..." ("base", xpos="far_left", ypos="head")
         maf "Alright then, I'll ask my grandson to give me some reference material."
+    elif item == cho_outfit_bunny:
+        gen "I need a bunny costume." ("base", xpos="far_left", ypos="head")
+        maf "Don't tell me you're trying to prove the existence of the were-rabbit again."
+        gen "The what?" ("base", xpos="far_left", ypos="head")
+        maf "May I remind you about the time you almost got shot by one of the centaurs, when they mistook you for a giant rabbit?"
+        gen "(Did this really happen?)" ("base", xpos="far_left", ypos="head")
+        gen "I don't want an actual bunny costume..." ("base", xpos="far_left", ypos="head")
+        gen "I want one of those sexy bunny outfits, the one you might see in a magazine." ("base", xpos="far_left", ypos="head")
+        maf "I see."
+        maf "Alright then, I'll see what I can do."
 
     #
     # Astoria Greengrass
@@ -556,6 +566,13 @@ label purchase_outfit(item):
         maf "In any case, I'm sure that my grandson has a comic with her. I'll just have to wrestle it out of his grubby little hands."
         gen "Thank you very much." ("base", xpos="far_left", ypos="head")
         maf "You're quite welcome."
+    elif item == lun_outfit_bunny:
+        gen "I'm looking to acquire a bunny costume." ("base", xpos="far_left", ypos="head")
+        maf "Certainly sir, how big is the bunny?"
+        gen "How big is the-- I'm talking about--" ("base", xpos="far_left", ypos="head")
+        maf "Just a little joke professor, I'm aware of what you meant."
+        gen "Oh... I see... Good one!" ("base", xpos="far_left", ypos="head")
+        maf "I'll get working on it as soon as possible."
     #     gen "Could you make me a Ravenclaw Cheerleader outfit?" ("base", xpos="far_left", ypos="head")
     #     maf "You're not showing favouritism towards Ravenclaw's Quidditch team are you?"
     #     gen "I'm merely looking to see if it'd be worth to bring cheerleading to this country." ("base", xpos="far_left", ypos="head")

From f10e6608ceafc28874851954c0b8d48f91314664 Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Wed, 14 Dec 2022 20:56:44 +0100
Subject: [PATCH 04/17] Virgin Killer outfit

* Added Cho Virgin killer outfit.
---
 .../cho/clothes/top/virgin_killer_top/0.webp  |  3 ++
 .../cho/clothes/top/virgin_killer_top/1.webp  |  3 ++
 .../top/virgin_killer_top/outline.webp        |  3 ++
 .../clothes/top/virgin_killer_top/skin.webp   |  3 ++
 game/scripts/characters/cho/wardrobe.rpy      |  8 ++++
 .../characters/cho/wardrobe_reactions.rpy     | 38 +++++++++++++++++++
 game/scripts/shops/dress/chitchats.rpy        |  9 +++++
 7 files changed, 67 insertions(+)
 create mode 100644 game/characters/cho/clothes/top/virgin_killer_top/0.webp
 create mode 100644 game/characters/cho/clothes/top/virgin_killer_top/1.webp
 create mode 100644 game/characters/cho/clothes/top/virgin_killer_top/outline.webp
 create mode 100644 game/characters/cho/clothes/top/virgin_killer_top/skin.webp

diff --git a/game/characters/cho/clothes/top/virgin_killer_top/0.webp b/game/characters/cho/clothes/top/virgin_killer_top/0.webp
new file mode 100644
index 00000000..3830ea8b
--- /dev/null
+++ b/game/characters/cho/clothes/top/virgin_killer_top/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ca95008f05054bb696b8beb0d4ce15030147f24d3a8c0f7277bed40b1b02e1a
+size 44372
diff --git a/game/characters/cho/clothes/top/virgin_killer_top/1.webp b/game/characters/cho/clothes/top/virgin_killer_top/1.webp
new file mode 100644
index 00000000..63f36002
--- /dev/null
+++ b/game/characters/cho/clothes/top/virgin_killer_top/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58565edd687ce8ca9488ac5fe35c9df4daeda1c7df0befc4b134f4afd09d2d62
+size 2864
diff --git a/game/characters/cho/clothes/top/virgin_killer_top/outline.webp b/game/characters/cho/clothes/top/virgin_killer_top/outline.webp
new file mode 100644
index 00000000..310d33c2
--- /dev/null
+++ b/game/characters/cho/clothes/top/virgin_killer_top/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cf889c43eb301c18e50bf921b2890a9df4d87cae41a364e34a577a31fcd8e3c
+size 20488
diff --git a/game/characters/cho/clothes/top/virgin_killer_top/skin.webp b/game/characters/cho/clothes/top/virgin_killer_top/skin.webp
new file mode 100644
index 00000000..55928d87
--- /dev/null
+++ b/game/characters/cho/clothes/top/virgin_killer_top/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7954e27ad9ef8ae73236acb86dc52a47beee27d14e23fd1c642a138d0c882c0e
+size 8684
diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy
index cd0848a8..6fe2cd55 100644
--- a/game/scripts/characters/cho/wardrobe.rpy
+++ b/game/scripts/characters/cho/wardrobe.rpy
@@ -226,6 +226,14 @@ default cho_top_bunny1 = DollCloth("cho", ("upper body", "one-piece suits"), "to
 #Todo ADD ears
 default cho_outfit_bunny = DollOutfit([cho_hair_ponytail1, cho_top_bunny1], price=250, name="Sexy Bunny Costume", desc="A costume to turn you into the bunny equivalent of a neko.")
 
+###################
+## Virgin Killer ##
+###################
+
+default cho_top_virgin_killer = DollCloth("cho", ("upper body", "one-piece suits"), "top", "virgin_killer_top", [[222, 64, 71, 255], [222, 64, 71, 255]], blacklist=["panties", "bra"], zorder=7, level=15)
+
+default cho_outfit_virgin_killer = DollOutfit([cho_hair_ponytail1, cho_top_virgin_killer], price=200, name="Virgin Killer", desc="Disclaimer: Does not actually kill virgins.")
+
 ###########
 ## Other ##
 ###########
diff --git a/game/scripts/characters/cho/wardrobe_reactions.rpy b/game/scripts/characters/cho/wardrobe_reactions.rpy
index 5c9071f0..c0163521 100644
--- a/game/scripts/characters/cho/wardrobe_reactions.rpy
+++ b/game/scripts/characters/cho/wardrobe_reactions.rpy
@@ -558,6 +558,21 @@ label cho_reaction_equip_outfit(item):
         cho "I'm fine, let me just put it on..." ("soft", "narrow", "base", "down", cheeks="blush")
         cho "" ("soft", "narrow", "base", "mid", cheeks="blush")
 
+    ###################
+    ## Virgin Killer ##
+    ###################
+    elif item == cho_outfit_virgin_killer: #req 14 (no bra, no panties)
+        gen "I've got this jumper I'd like you to put on." ("base", xpos="far_left", ypos="head")
+        cho "A jumper?" ("soft", "base", "base", "mid")
+        gen "Yup, is that surprising?." ("base", xpos="far_left", ypos="head")
+        cho "*Hmm*... I suppose I would've imagined something more--" ("open", "base", "base", "R")
+        gen "Here you go." ("base", xpos="far_left", ypos="head")
+        cho "Oh... It's one of those." ("open", "narrow", "base", "down", cheeks="blush")
+        gen "Do you like it?" ("base", xpos="far_left", ypos="head")
+        gen "I thought it would enhance your features." ("base", xpos="far_left", ypos="head")
+        cho "*Hmm*... If you say so..." ("base", "narrow", "base", "down", cheeks="blush")
+        cho "Alright, just give me a moment to put it on." ("base", "base", "base", "mid", cheeks="blush")
+
     # TODO: Blacklist fallbacks have to be added.
     return
 
@@ -945,6 +960,29 @@ label cho_reaction_equip_outfit_fail(item):
         gen "This isn't at all what I asked for!" ("angry", xpos="far_left", ypos="head")
         gen "I'm going to have to give that seamstress a piece of my mind!" ("angry", xpos="far_left", ypos="head")
         cho "..." ("disgust", "narrow", "base", "mid")
+
+    ###################
+    ## Virgin Killer ##
+    ###################
+    elif item == cho_outfit_virgin_killer: #req 14 (no bra, no panties)
+        gen "Ever heard of a virgin killer?" ("base", xpos="far_left", ypos="head")
+        cho "Can't say that I have, is it some kind of drink?" ("soft", "base", "base", "mid")
+        gen "Good guess, but no. It's a type of jumper." ("base", xpos="far_left", ypos="head")
+        cho "I see... Why are you telling me this?" ("open", "narrow", "raised", "mid")
+        gen "Well, I've heard that they're the rage these days, so I got you one." ("base", xpos="far_left", ypos="head")
+        cho "Oh, well, that's very kind of you." ("base", "base", "base", "mid")
+        gen "Here you go." ("base", xpos="far_left", ypos="head")
+        cho "..." ("disgust", "narrow", "base", "down")
+        cho "*Ehm*... Did you actually look at this before you decided to give it to me?" ("open", "narrow", "base", "down", cheeks="blush")
+        gen "Not really, why?" ("base", xpos="far_left", ypos="head")
+        cho "Well, it's a bit revealing." ("upset", "narrow", "base", "mid", cheeks="blush")
+        gen "What?! Really?" ("base", xpos="far_left", ypos="head")
+        gen "But I spent so much money on it!" ("base", xpos="far_left", ypos="head")
+        gen "Are you sure it's that bad?" ("base", xpos="far_left", ypos="head")
+        cho "Yeah, it's pretty bad alright." ("angry", "narrow", "base", "down", cheeks="blush")
+        gen "Well, I guess I'll have to try to return it... Damn!" ("base", xpos="far_left", ypos="head")
+        cho "" ("angry", "narrow", "base", "mid", cheeks="blush")
+
     else:
         $ random_number = renpy.random.randint(1, 5)
         if random_number == 1:
diff --git a/game/scripts/shops/dress/chitchats.rpy b/game/scripts/shops/dress/chitchats.rpy
index 116f7320..c31aebb0 100644
--- a/game/scripts/shops/dress/chitchats.rpy
+++ b/game/scripts/shops/dress/chitchats.rpy
@@ -410,6 +410,15 @@ label purchase_outfit(item):
         gen "I want one of those sexy bunny outfits, the one you might see in a magazine." ("base", xpos="far_left", ypos="head")
         maf "I see."
         maf "Alright then, I'll see what I can do."
+    elif item == cho_outfit_virgin_killer:
+        gen "Virgin killer?" ("base", xpos="far_left", ypos="head")
+        maf "Not so much these days, but you should've seen me in my--"
+        maf "Oh, you're referring to the jumper."
+        gen "Of course, although now I'm more intrigued about--" ("base", xpos="far_left", ypos="head")
+        maf "I doubt that would be a good idea... You pay me by the hour, after all."
+        gen "... Alright then." ("base", xpos="far_left", ypos="head")
+        maf "I shall have your jumper ready as soon as possible."
+
 
     #
     # Astoria Greengrass

From 32813877113604705b632c5b24dec71296fb850b Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Thu, 15 Dec 2022 21:07:32 +0100
Subject: [PATCH 05/17] Outfits

* Added remaining outfit pieces
---
 game/scripts/characters/cho/wardrobe.rpy      | 11 ++++++-----
 game/scripts/characters/hermione/wardrobe.rpy |  9 +++++----
 game/scripts/characters/luna/wardrobe.rpy     |  5 ++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy
index 6fe2cd55..a98549aa 100644
--- a/game/scripts/characters/cho/wardrobe.rpy
+++ b/game/scripts/characters/cho/wardrobe.rpy
@@ -211,9 +211,9 @@ default cho_outfit_police = DollOutfit([cho_hair_ponytail1, cho_top_police1, cho
 ######################
 
 default cho_top_bunny2 = DollCloth("cho", ("upper body", "one-piece suits"), "top", "bunny_top_2", [[132, 34, 11, 255]], blacklist=["panties", "bra"], zorder=7, level=15)
-default cho_hat_antlers = DollCloth("cho", ("head", "headgear"), "headgear", "antlers", [[152, 75, 48, 255], [255, 255, 255, 255], [194, 157, 99, 255]])
-default cho_neckwear_reindeer_collar = DollCloth("cho", ("head", "neckwear"), "neckwear", "reindeer_collar", [[126, 68, 34, 255], [196, 171, 95, 255]])
-default cho_accessory3_mistletoe = DollCloth("cho", ("misc", "accessory"), "accessory3", "mistletoe", [[27, 92, 201, 255]], zorder=16, level=5)
+default cho_hat_antlers = DollCloth("cho", ("head", "headgear"), "headgear", "antlers", [[152, 75, 48, 255], [255, 255, 255, 255], [194, 157, 99, 255]], level=12)
+default cho_neckwear_reindeer_collar = DollCloth("cho", ("head", "neckwear"), "neckwear", "reindeer_collar", [[126, 68, 34, 255], [196, 171, 95, 255]], level=15)
+default cho_accessory3_mistletoe = DollCloth("cho", ("misc", "accessory"), "accessory3", "mistletoe", [[27, 92, 201, 255]], zorder=16, level=7)
 
 default cho_outfit_reindeer = DollOutfit([cho_hair_ponytail1, cho_top_bunny2, cho_accessory3_mistletoe, cho_hat_antlers, cho_neckwear_reindeer_collar])
 
@@ -222,9 +222,10 @@ default cho_outfit_reindeer = DollOutfit([cho_hair_ponytail1, cho_top_bunny2, ch
 ###################
 
 default cho_top_bunny1 = DollCloth("cho", ("upper body", "one-piece suits"), "top", "bunny_top_1", [[0, 0, 0, 255]], blacklist=["panties", "bra"], zorder=7, level=15)
+default cho_stockings_bunny1 = DollCloth("cho", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], armfix=True, level=5)
+default cho_hat_bunny1 = DollCloth("cho", ("head", "headgear"), "headgear", "bunny_hat_1", [[43, 42, 50, 255], [87, 83, 112, 255]], level=15)
 
-#Todo ADD ears
-default cho_outfit_bunny = DollOutfit([cho_hair_ponytail1, cho_top_bunny1], price=250, name="Sexy Bunny Costume", desc="A costume to turn you into the bunny equivalent of a neko.")
+default cho_outfit_bunny = DollOutfit([cho_hair_ponytail1, cho_top_bunny1, cho_stockings_bunny1, cho_hat_bunny1], price=250, name="Sexy Bunny Costume", desc="A costume to turn you into the bunny equivalent of a neko.")
 
 ###################
 ## Virgin Killer ##
diff --git a/game/scripts/characters/hermione/wardrobe.rpy b/game/scripts/characters/hermione/wardrobe.rpy
index 6f429ba5..0b21acf0 100644
--- a/game/scripts/characters/hermione/wardrobe.rpy
+++ b/game/scripts/characters/hermione/wardrobe.rpy
@@ -154,21 +154,22 @@ default her_top_bunny2 = DollCloth("hermione", ("upper body", "one-piece suits")
 default her_stockings_bunny1 = DollCloth("hermione", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], level=19)
 default her_tattoo3_bunny1 = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo3", "bunny_tattoo1", [[0, 0, 1, 255]])
 default her_hat_bunny1 = DollCloth("hermione", ("head", "headgear"), "headgear", "bunny_hat_1", [[48, 48, 48, 255], [232, 232, 232, 255]], level=13)
+default her_hat_bunny2 = DollCloth("hermione", ("head", "headgear"), "headgear", "bunny_hat_2", [[183, 168, 115, 255], [219, 161, 140, 255], [253, 253, 253, 255]], level=13)
 default her_gloves_bunny1 = DollCloth("hermione", ("upper body", "gloves"), "gloves", "bunny_gloves_1", [[232, 232, 232, 255]], level=4)
 default her_neckwear_bunny1 = DollCloth("hermione", ("head", "neckwear"), "neckwear", "bunny_bowtie_1", [[232, 232, 232, 255], [48, 48, 48, 255]], level=4)
-#TODO replace with new ears
 
-default her_outfit_bunny = DollOutfit([her_hair_base, her_top_bunny2, her_stockings_bunny1, her_tattoo3_bunny1, her_hat_bunny1, her_gloves_bunny1, her_neckwear_bunny1], addons=[her_top_bunny1], price=350, name="Sexy Bunny Costume", desc="What's up doc?")
+default her_outfit_bunny = DollOutfit([her_hair_base, her_top_bunny2, her_stockings_bunny1, her_tattoo3_bunny1, her_hat_bunny2, her_gloves_bunny1, her_neckwear_bunny1], addons=[her_top_bunny1, her_hat_bunny1], price=350, name="Sexy Bunny Costume", desc="What's up doc?")
 
 ######################
 ## Reindeer Costume ##
 ######################
 
-#TODO add antlers
+default her_hat_antlers2 = DollCloth("hermione", ("head", "headgear"), "headgear", "antlers_2", [[153, 76, 48, 255], [255, 255, 255, 255], [198, 159, 101, 255]], level=12)
+default her_neckwear_studded_choker = DollCloth("hermione", ("head", "neckwear"), "neckwear", "studded_choker", [[43, 42, 50, 255], [210, 207, 231, 255]], level=16)
 default her_top_bunny3 = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "bunny_top_3", [[138, 75, 4, 255]], blacklist=["panties", "bra"], zorder=7, level=19)
 default her_accessory3_mistletoe = DollCloth("hermione", ("misc", "accessory"), "accessory3", "mistletoe", [[200, 32, 0, 255]], zorder=16, level=7)
 
-default her_outfit_reindeer = DollOutfit([her_hair_base, her_top_bunny3, her_accessory3_mistletoe, her_stockings_bunny1])
+default her_outfit_reindeer = DollOutfit([her_hair_base, her_top_bunny3, her_accessory3_mistletoe, her_stockings_bunny1, her_neckwear_studded_choker, her_hat_antlers2])
 
 ################
 ## Ball Dress ##
diff --git a/game/scripts/characters/luna/wardrobe.rpy b/game/scripts/characters/luna/wardrobe.rpy
index a8bc87e0..60307b42 100644
--- a/game/scripts/characters/luna/wardrobe.rpy
+++ b/game/scripts/characters/luna/wardrobe.rpy
@@ -178,11 +178,10 @@ default lun_outfit_reindeer = DollOutfit([lun_hair_base, lun_top_bunny2, lun_nec
 ## Bunny ##
 ###########
 
-#Todo ADD ears
+default lun_hat_bunny1 = DollCloth("luna", ("head", "headgear"), "headgear", "bunny_hat_1", [[219, 161, 140, 255], [253, 227, 171, 255]])
 default lun_top_bunny1 = DollCloth("luna", ("upper body", "one-piece suits"), "top", "bunny_top_1", [[0, 0, 0, 255]], blacklist=["panties", "bra"], zorder=7, level=7)
 
-#TODO ADD ears
-default lun_outfit_bunny = DollOutfit([lun_hair_base, lun_top_bunny1, lun_stockings_pantyhose_meshed], price=250, name="Sexy Bunny Costume", desc="A bunny costume for when you're hopping mad.")
+default lun_outfit_bunny = DollOutfit([lun_hair_base, lun_top_bunny1, lun_stockings_pantyhose_meshed, lun_hat_bunny1], price=250, name="Sexy Bunny Costume", desc="A bunny costume for when you're hopping mad.")
 
 
 #################

From b26dbb4f0654b7c88e6912efdcb1e12bfc69e5fb Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Thu, 15 Dec 2022 21:08:24 +0100
Subject: [PATCH 06/17] Outfits

* Added remaining outfit pieces
---
 game/characters/cho/clothes/headgear/bunny_hat_1/0.webp        | 3 +++
 game/characters/cho/clothes/headgear/bunny_hat_1/1.webp        | 3 +++
 game/characters/cho/clothes/headgear/bunny_hat_1/outline.webp  | 3 +++
 game/characters/cho/clothes/stockings/bunny_stockings_1/0.webp | 3 +++
 .../cho/clothes/stockings/bunny_stockings_1/outline.webp       | 3 +++
 game/characters/hermione/clothes/headgear/antlers_2/0.webp     | 3 +++
 game/characters/hermione/clothes/headgear/antlers_2/1.webp     | 3 +++
 game/characters/hermione/clothes/headgear/antlers_2/2.webp     | 3 +++
 .../hermione/clothes/headgear/antlers_2/outline.webp           | 3 +++
 game/characters/hermione/clothes/headgear/bunny_hat_2/0.webp   | 3 +++
 game/characters/hermione/clothes/headgear/bunny_hat_2/1.webp   | 3 +++
 game/characters/hermione/clothes/headgear/bunny_hat_2/2.webp   | 3 +++
 .../hermione/clothes/headgear/bunny_hat_2/outline.webp         | 3 +++
 .../characters/hermione/clothes/neckwear/studded_choker/0.webp | 3 +++
 .../characters/hermione/clothes/neckwear/studded_choker/1.webp | 3 +++
 .../hermione/clothes/neckwear/studded_choker/extra.webp        | 3 +++
 .../hermione/clothes/neckwear/studded_choker/outline.webp      | 3 +++
 game/characters/luna/clothes/headgear/bunny_hat_1/0.webp       | 3 +++
 game/characters/luna/clothes/headgear/bunny_hat_1/1.webp       | 3 +++
 game/characters/luna/clothes/headgear/bunny_hat_1/outline.webp | 3 +++
 20 files changed, 60 insertions(+)
 create mode 100644 game/characters/cho/clothes/headgear/bunny_hat_1/0.webp
 create mode 100644 game/characters/cho/clothes/headgear/bunny_hat_1/1.webp
 create mode 100644 game/characters/cho/clothes/headgear/bunny_hat_1/outline.webp
 create mode 100644 game/characters/cho/clothes/stockings/bunny_stockings_1/0.webp
 create mode 100644 game/characters/cho/clothes/stockings/bunny_stockings_1/outline.webp
 create mode 100644 game/characters/hermione/clothes/headgear/antlers_2/0.webp
 create mode 100644 game/characters/hermione/clothes/headgear/antlers_2/1.webp
 create mode 100644 game/characters/hermione/clothes/headgear/antlers_2/2.webp
 create mode 100644 game/characters/hermione/clothes/headgear/antlers_2/outline.webp
 create mode 100644 game/characters/hermione/clothes/headgear/bunny_hat_2/0.webp
 create mode 100644 game/characters/hermione/clothes/headgear/bunny_hat_2/1.webp
 create mode 100644 game/characters/hermione/clothes/headgear/bunny_hat_2/2.webp
 create mode 100644 game/characters/hermione/clothes/headgear/bunny_hat_2/outline.webp
 create mode 100644 game/characters/hermione/clothes/neckwear/studded_choker/0.webp
 create mode 100644 game/characters/hermione/clothes/neckwear/studded_choker/1.webp
 create mode 100644 game/characters/hermione/clothes/neckwear/studded_choker/extra.webp
 create mode 100644 game/characters/hermione/clothes/neckwear/studded_choker/outline.webp
 create mode 100644 game/characters/luna/clothes/headgear/bunny_hat_1/0.webp
 create mode 100644 game/characters/luna/clothes/headgear/bunny_hat_1/1.webp
 create mode 100644 game/characters/luna/clothes/headgear/bunny_hat_1/outline.webp

diff --git a/game/characters/cho/clothes/headgear/bunny_hat_1/0.webp b/game/characters/cho/clothes/headgear/bunny_hat_1/0.webp
new file mode 100644
index 00000000..d80a8b17
--- /dev/null
+++ b/game/characters/cho/clothes/headgear/bunny_hat_1/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5a4cef038d07acb93f181d5f7f6f17370c54719cab8a0a483935b7c422b2f9d
+size 5604
diff --git a/game/characters/cho/clothes/headgear/bunny_hat_1/1.webp b/game/characters/cho/clothes/headgear/bunny_hat_1/1.webp
new file mode 100644
index 00000000..1df191f8
--- /dev/null
+++ b/game/characters/cho/clothes/headgear/bunny_hat_1/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e676705c15439cecd757b09db919e706064e2b37c51aff91217fc4f76af96890
+size 1524
diff --git a/game/characters/cho/clothes/headgear/bunny_hat_1/outline.webp b/game/characters/cho/clothes/headgear/bunny_hat_1/outline.webp
new file mode 100644
index 00000000..6a91b873
--- /dev/null
+++ b/game/characters/cho/clothes/headgear/bunny_hat_1/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25a8f5d2572d44525c3446bf77fd8964c81a942fe874477df0f31c1facd68aee
+size 5330
diff --git a/game/characters/cho/clothes/stockings/bunny_stockings_1/0.webp b/game/characters/cho/clothes/stockings/bunny_stockings_1/0.webp
new file mode 100644
index 00000000..c626d10e
--- /dev/null
+++ b/game/characters/cho/clothes/stockings/bunny_stockings_1/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81e757df86fcf7b1f345ff373657f35a3b049af780778d1fa685b2e9224da65d
+size 4368
diff --git a/game/characters/cho/clothes/stockings/bunny_stockings_1/outline.webp b/game/characters/cho/clothes/stockings/bunny_stockings_1/outline.webp
new file mode 100644
index 00000000..4178b93e
--- /dev/null
+++ b/game/characters/cho/clothes/stockings/bunny_stockings_1/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a349908b966c38f4860e4c0a3c8acdfbb8297a8a722dac4438be47c14b8275d
+size 42184
diff --git a/game/characters/hermione/clothes/headgear/antlers_2/0.webp b/game/characters/hermione/clothes/headgear/antlers_2/0.webp
new file mode 100644
index 00000000..9ed1ea97
--- /dev/null
+++ b/game/characters/hermione/clothes/headgear/antlers_2/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3f85ac2a1052388d21d9bcd430ba69ab32e73df9ca87e3307aefc5bffd556cd
+size 2596
diff --git a/game/characters/hermione/clothes/headgear/antlers_2/1.webp b/game/characters/hermione/clothes/headgear/antlers_2/1.webp
new file mode 100644
index 00000000..7ca59c86
--- /dev/null
+++ b/game/characters/hermione/clothes/headgear/antlers_2/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37d9e6cf19e0e7b2b755e687b7d089b37508b5c8b3308b74b958cc9cc6751162
+size 1038
diff --git a/game/characters/hermione/clothes/headgear/antlers_2/2.webp b/game/characters/hermione/clothes/headgear/antlers_2/2.webp
new file mode 100644
index 00000000..030b67ab
--- /dev/null
+++ b/game/characters/hermione/clothes/headgear/antlers_2/2.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16bec3abb0be9ad3ca97b5b22392edf53d880834ef366d8d3ee1a3775483fd4f
+size 8666
diff --git a/game/characters/hermione/clothes/headgear/antlers_2/outline.webp b/game/characters/hermione/clothes/headgear/antlers_2/outline.webp
new file mode 100644
index 00000000..df16ec84
--- /dev/null
+++ b/game/characters/hermione/clothes/headgear/antlers_2/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e25fe6046899b05910eb49858c4ac98463be8ac80589983c663230e7f7fe49b8
+size 12466
diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_2/0.webp b/game/characters/hermione/clothes/headgear/bunny_hat_2/0.webp
new file mode 100644
index 00000000..29ce0969
--- /dev/null
+++ b/game/characters/hermione/clothes/headgear/bunny_hat_2/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91d23b10ca100e49558cf6e5b097f781c26975ec0152aa6c2785f9ec87150891
+size 1622
diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_2/1.webp b/game/characters/hermione/clothes/headgear/bunny_hat_2/1.webp
new file mode 100644
index 00000000..a0ee6fdc
--- /dev/null
+++ b/game/characters/hermione/clothes/headgear/bunny_hat_2/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d594af6da14f206b086a20894189b58f21902df373024d74205e816403353b21
+size 4954
diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_2/2.webp b/game/characters/hermione/clothes/headgear/bunny_hat_2/2.webp
new file mode 100644
index 00000000..24c6db9f
--- /dev/null
+++ b/game/characters/hermione/clothes/headgear/bunny_hat_2/2.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17910f835d7fe36db79e2a39f03a5783125adb4f1ce0a3e8ab0ed55e4ce6d9a4
+size 7318
diff --git a/game/characters/hermione/clothes/headgear/bunny_hat_2/outline.webp b/game/characters/hermione/clothes/headgear/bunny_hat_2/outline.webp
new file mode 100644
index 00000000..0e524fb8
--- /dev/null
+++ b/game/characters/hermione/clothes/headgear/bunny_hat_2/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c22879dcb6a94018faedc4e9dc830ccdd505a0eeac4c8e6e02a181a47bf1f6f5
+size 11078
diff --git a/game/characters/hermione/clothes/neckwear/studded_choker/0.webp b/game/characters/hermione/clothes/neckwear/studded_choker/0.webp
new file mode 100644
index 00000000..b0f1feee
--- /dev/null
+++ b/game/characters/hermione/clothes/neckwear/studded_choker/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d8abed21378225d1b9ed762c184bd0d3eda1e4bd1967b2dac3cc777889ebaa8
+size 1822
diff --git a/game/characters/hermione/clothes/neckwear/studded_choker/1.webp b/game/characters/hermione/clothes/neckwear/studded_choker/1.webp
new file mode 100644
index 00000000..9ed12809
--- /dev/null
+++ b/game/characters/hermione/clothes/neckwear/studded_choker/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5e0e32ce7e1200fbd2c648a5737834d568039ce3aebbe1ffa81828dc2177f98
+size 1354
diff --git a/game/characters/hermione/clothes/neckwear/studded_choker/extra.webp b/game/characters/hermione/clothes/neckwear/studded_choker/extra.webp
new file mode 100644
index 00000000..3e8ac557
--- /dev/null
+++ b/game/characters/hermione/clothes/neckwear/studded_choker/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:996e0a0c0e6a3ab94ae1a4b31538ff62e79b439d197e4fed3df7ab707f878e6d
+size 1136
diff --git a/game/characters/hermione/clothes/neckwear/studded_choker/outline.webp b/game/characters/hermione/clothes/neckwear/studded_choker/outline.webp
new file mode 100644
index 00000000..2659f904
--- /dev/null
+++ b/game/characters/hermione/clothes/neckwear/studded_choker/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a883945686fc926756f9cae38ad92bd47f2f40d9b231859d9f630c5b52756786
+size 2634
diff --git a/game/characters/luna/clothes/headgear/bunny_hat_1/0.webp b/game/characters/luna/clothes/headgear/bunny_hat_1/0.webp
new file mode 100644
index 00000000..d29ddc86
--- /dev/null
+++ b/game/characters/luna/clothes/headgear/bunny_hat_1/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97ec5ddee717488aa27a329598d4eb023072576801e0a7273aa786c88ee552ef
+size 5848
diff --git a/game/characters/luna/clothes/headgear/bunny_hat_1/1.webp b/game/characters/luna/clothes/headgear/bunny_hat_1/1.webp
new file mode 100644
index 00000000..c0097682
--- /dev/null
+++ b/game/characters/luna/clothes/headgear/bunny_hat_1/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66939f733b4ee4b2752f656c472d645efca3f3d0231a1c7029dce7257060cf26
+size 8532
diff --git a/game/characters/luna/clothes/headgear/bunny_hat_1/outline.webp b/game/characters/luna/clothes/headgear/bunny_hat_1/outline.webp
new file mode 100644
index 00000000..b522867e
--- /dev/null
+++ b/game/characters/luna/clothes/headgear/bunny_hat_1/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb2dfc2f3543bd20265249d17a7069cc538a7687f68deb84dab1afee3bc709e8
+size 8134

From 367fabc73987556eca060773176b4c84f77712c4 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Sat, 17 Dec 2022 21:52:44 +0000
Subject: [PATCH 07/17] Decorations

* Added naughty list decor
* Added window decor
* Added garland decor
* Improved poster enlarging
---
 .../decorations/santas_naughty_list.webp      |  3 +
 .../objects/decorations/xmas_garland.webp     |  3 +
 .../xmas_window_santa_base.webp               |  3 +
 .../xmas_window_santa_light.webp              |  3 +
 .../xmas_window_santa_mask.webp               |  3 +
 .../ui/naughty_list/naughty_list scroll.webp  |  3 +
 .../ui/naughty_list/naughty_list spacer.webp  |  3 +
 game/interface/icons/santas_naughty_list.webp |  3 +
 game/interface/icons/xmas_garland.webp        |  3 +
 game/interface/icons/xmas_window_santa.webp   |  3 +
 game/scripts/inventory/decorations.rpy        |  3 +
 .../mirror/events/genies_christmas_wish.rpy   | 16 +++--
 game/scripts/rooms/main_room/images.rpy       | 26 +++++++
 .../rooms/main_room/objects/poster.rpy        | 69 ++++++++++++++++---
 14 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 game/images/rooms/objects/decorations/santas_naughty_list.webp
 create mode 100644 game/images/rooms/objects/decorations/xmas_garland.webp
 create mode 100644 game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_base.webp
 create mode 100644 game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_light.webp
 create mode 100644 game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_mask.webp
 create mode 100644 game/images/ui/naughty_list/naughty_list scroll.webp
 create mode 100644 game/images/ui/naughty_list/naughty_list spacer.webp
 create mode 100644 game/interface/icons/santas_naughty_list.webp
 create mode 100644 game/interface/icons/xmas_garland.webp
 create mode 100644 game/interface/icons/xmas_window_santa.webp

diff --git a/game/images/rooms/objects/decorations/santas_naughty_list.webp b/game/images/rooms/objects/decorations/santas_naughty_list.webp
new file mode 100644
index 00000000..7ac85aac
--- /dev/null
+++ b/game/images/rooms/objects/decorations/santas_naughty_list.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de4cf6a132b8785348d4222653898871a1cd332bcc3f1fddd7ccfb1cfd06e00e
+size 16630
diff --git a/game/images/rooms/objects/decorations/xmas_garland.webp b/game/images/rooms/objects/decorations/xmas_garland.webp
new file mode 100644
index 00000000..c34cda20
--- /dev/null
+++ b/game/images/rooms/objects/decorations/xmas_garland.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a088606912fde5ad7728aa8c53eee8693d6787b1e3b454228fe0edd3c9813a4
+size 234868
diff --git a/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_base.webp b/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_base.webp
new file mode 100644
index 00000000..440973c4
--- /dev/null
+++ b/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_base.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cf3b7a2416ab09c2769c02d9a483a27f7b0aada4cbf3f3ee3d704457087948b
+size 1316
diff --git a/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_light.webp b/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_light.webp
new file mode 100644
index 00000000..11c0a4cd
--- /dev/null
+++ b/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_light.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71a73eb190313aad71b1ab452ebea5fb36cd1dea0baa89c2642e854b257a55a0
+size 1980
diff --git a/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_mask.webp b/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_mask.webp
new file mode 100644
index 00000000..7c349368
--- /dev/null
+++ b/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_mask.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d669ec303b8919a09e90086871965f805df65559009ff8c62432a493a162e98
+size 3490
diff --git a/game/images/ui/naughty_list/naughty_list scroll.webp b/game/images/ui/naughty_list/naughty_list scroll.webp
new file mode 100644
index 00000000..ba8a4c70
--- /dev/null
+++ b/game/images/ui/naughty_list/naughty_list scroll.webp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40a3cae224584730ec302280962317386408539da126638b4426ff466e545a12
+size 186354
diff --git a/game/images/ui/naughty_list/naughty_list spacer.webp b/game/images/ui/naughty_list/naughty_list spacer.webp
new file mode 100644
index 00000000..330c6d23
--- /dev/null
+++ b/game/images/ui/naughty_list/naughty_list spacer.webp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:451d3f36568d0c23e5a75b9f9979661c3b35d6e93589a672d3a4fc01c2d55931
+size 1666
diff --git a/game/interface/icons/santas_naughty_list.webp b/game/interface/icons/santas_naughty_list.webp
new file mode 100644
index 00000000..b5bd83a8
--- /dev/null
+++ b/game/interface/icons/santas_naughty_list.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42f5240e8641f220b53ea7611c9d7c99c18ad7530dc4b951be0d7412ae115304
+size 41554
diff --git a/game/interface/icons/xmas_garland.webp b/game/interface/icons/xmas_garland.webp
new file mode 100644
index 00000000..7ff585f9
--- /dev/null
+++ b/game/interface/icons/xmas_garland.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0648f1dc6877a63b36d080ecd85df8d0335ed73c128c594f26053ec96c9dace7
+size 24436
diff --git a/game/interface/icons/xmas_window_santa.webp b/game/interface/icons/xmas_window_santa.webp
new file mode 100644
index 00000000..c24f09f4
--- /dev/null
+++ b/game/interface/icons/xmas_window_santa.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19d376aa067b50b83282067e054d0dbf3406fdf7c67b74f31455e346523a32bb
+size 7670
diff --git a/game/scripts/inventory/decorations.rpy b/game/scripts/inventory/decorations.rpy
index 31966646..1876b5bd 100644
--- a/game/scripts/inventory/decorations.rpy
+++ b/game/scripts/inventory/decorations.rpy
@@ -11,6 +11,7 @@ default harlot_poster_ITEM = Decoration("harlot_poster", "decoration", "Hogwarts
 default stripper_poster_ITEM = Decoration("stripper_poster", "decoration", "Stripper Poster", poster_OBJ, 2, "Hermione showing off how to work the pole... illusion charm included...")
 default wanted_poster_ITEM = Decoration("wanted_poster", "decoration", "Wanted Poster", poster_OBJ, 2, "A Wild West styled Wanted poster depicting our dear headmaster...")
 default tonks_poster_ITEM = Decoration("tonks_poster", "decoration", "Tonks Poster", poster_OBJ, 2, "Professor Tonks in her early twenties.")
+default naughty_list_ITEM = Decoration("santas_naughty_list", "decoration", "Santa's Naughty List", poster_OBJ, 2, "See who was a bad boy, or a bad girl this year!", replace_action=Jump("naughty_list"))
 
 default stag_trophy_ITEM = Decoration("stag_trophy", "decoration", "Stag Trophy", trophy_OBJ, 3, "A perfect decoration over your mantelpiece to add a sense of masculinity to the office.")
 default crest_trophy_ITEM = Decoration("crest_trophy", "decoration", "Hogwarts Crest", trophy_OBJ, 3, "A perfect decoration for the headmaster.")
@@ -44,3 +45,5 @@ default small_owl_ITEM = Decoration("small_owl", "decoration", "Small Owl", owl_
 default xmas_lights_ITEM = Decoration("xmas_lights", "decoration", "Christmas Lights", chandelier_OBJ, 5, "A programmable set of LED lights. Remote control batteries not included.", replaces=True, room_image="xmas_lights_alternate", replace_action=Jump("xmas_lights_settings"), replace_anchor=(0.0, 0.0), replace_pos=(0, 0))
 default xmas_wreaths_ITEM = Decoration("xmas_wreaths", "decoration", "Christmas Wreaths", door_OBJ, 5, "Chrismtas Wreaths to spread the christmas cheer.", room_image="xmas_wreaths")
 default xmas_giftchair_ITEM = Decoration("xmas_giftchair", "decoration", "Christmas Wreaths", chair_OBJ, 5, "A baby-sized gift-wrapped box. I wonder what's inside?", room_image="xmas_giftchair")
+default xmas_garland_ITEM = Decoration("xmas_garland", "decoration", "Christmas Garland", chandelier_OBJ, 5, "A ever-so-green enchanted garland to get you into christmas spirit!", replace_anchor=(0.0, 0.0), replace_pos=(0, 0))
+default xmas_window_santa_ITEM = Decoration("xmas_window_santa", "decoration", "Christmas Window Enchantement", window_OBJ, 5, "A window enchantment that will make you think twice before saying \"I don't believe in Santa\" ever again.", room_image="xmas_window_santa", replace_anchor=(0.0, 0.0), replace_pos=(0,0))
diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
index 62b770e2..19a2371a 100644
--- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -5,7 +5,12 @@ label genies_christmas_wish_rewards:
         call unlock_clothing(text=">New clothing items for Cho have been unlocked!", item=cho_outfit_reindeer)
         call unlock_clothing(text=">New clothing items for Luna have been unlocked!", item=lun_outfit_reindeer)
 
-    # TODO: Add Decoration rewards
+        python:
+            naughty_list_ITEM.owned = 1
+            xmas_garland_ITEM.owned = 1
+            xmas_window_santa_ITEM.owned = 1
+
+        call give_reward(text=">You have received a bunch of new room decorations!", gift="interface/icons/santas_naughty_list.webp")
 
     return
 
@@ -15,10 +20,10 @@ label genies_christmas_wish:
 
     #TODO Add decorations
 
-    # $ fireplace_OBJ.foreground = "fireplace_fire"
-    # $ phoenix_OBJ.decoration = xmas_phoenix_ITEM
-    # $ owl_OBJ.decoration = xmas_owl_ITEM
-    # $ fireplace_OBJ.decoration = xmas_fireplace_ITEM
+    $ fireplace_OBJ.foreground = "fireplace_fire"
+    $ window_OBJ.decoration = xmas_window_santa_ITEM
+    $ chandelier_OBJ.decoration = xmas_garland_ITEM
+    $ poster_OBJ.decoration = naughty_list_ITEM
     $ hermione.equip(her_outfit_reindeer)
     $ cho.equip(cho_outfit_reindeer)
     $ luna.equip(lun_outfit_reindeer)
@@ -117,6 +122,7 @@ label genies_christmas_wish:
     gen "No I'm not!" ("base", xpos="far_left", ypos="head")
 
     show screen blkfade
+    with d3
     play sound "sounds/woosh.ogg"
 
     nar "His eyes now shut, as they had been sprayed by magic sand."
diff --git a/game/scripts/rooms/main_room/images.rpy b/game/scripts/rooms/main_room/images.rpy
index ddcf6817..24d8fe53 100644
--- a/game/scripts/rooms/main_room/images.rpy
+++ b/game/scripts/rooms/main_room/images.rpy
@@ -668,3 +668,29 @@ image xmas_giftchair:
     pos (35, 108)
 
     "images/rooms/objects/decorations/xmas_giftchair.webp"
+
+image xmas_window_santa_doodle:
+    size (2160, 1200)
+    contains:
+        animation
+        size (240, 108)
+        subpixel True
+        offset (640, 460)
+
+        contains:
+            fit "fill"
+            "xmas_window_santa_base"
+        contains:
+            animation
+            fit "fill"
+            "xmas_window_santa_light"
+
+            linear 0.5 alpha 0.1
+            linear 0.5 alpha 1.0
+            repeat
+
+        linear 10.0 xoffset 1000
+        pause 10.0
+        repeat
+
+image xmas_window_santa = AlphaMask("xmas_window_santa_doodle", "xmas_window_santa_mask")
diff --git a/game/scripts/rooms/main_room/objects/poster.rpy b/game/scripts/rooms/main_room/objects/poster.rpy
index 16b80350..1687f688 100644
--- a/game/scripts/rooms/main_room/objects/poster.rpy
+++ b/game/scripts/rooms/main_room/objects/poster.rpy
@@ -1,18 +1,69 @@
 label enlarge_poster:
-    show screen blktone
-    show screen poster
-    with d3
+    show image "#00000080" as underlay
+    $ renpy.show(name="poster", what=Image(poster_OBJ.decoration.image), zorder=25, at_list=[truecenter])
 
     call ctc
 
-    hide screen blktone
-    hide screen poster
+    hide poster
+    hide underlay
     with d3
 
     jump main_room_menu
 
-screen poster():
-    zorder 25
-    tag poster
+# Xmas 2022 - Decoration
 
-    add poster_OBJ.decoration.image align (0.5, 0.5)
+default naughty_list_commentary = False
+
+label naughty_list:
+
+    python:
+        _username = None
+        _d = [(i, get_character_progression(i)) for i in CHARACTERS if get_character_unlock(i)]
+        _d.append(["Snape", sna_friendship])
+
+        try:
+            _username = os.getlogin().split(" ")[0].capitalize()
+            _d.append([_username, 999])
+        except:
+            _d.append(["Genie", 999])
+
+        _d.sort(key=lambda x: x[1], reverse=True)
+
+
+    show screen naughty_list(_d)
+    with d3
+
+    if not naughty_list_commentary:
+        $ naughty_list_commentary = True
+
+        pause 1.0
+
+        if _username:
+            gen "List checks out... But who the fuck is [_username]?" ("base", xpos="far_left", ypos="head")
+        else:
+            gen "I'm on the first place, nice!" ("base", xpos="far_left", ypos="head")
+
+    call ctc
+
+    hide screen naughty_list
+    with d3
+
+    jump main_room_menu
+
+screen naughty_list(d):
+    zorder 25
+
+    add "#00000080"
+    add "naughty_list scroll" fit "cover" at truecenter
+
+    vbox:
+        align (0.51, 0.66)
+        spacing 2
+
+        for i, (name, _) in enumerate(d, start=1):
+
+            fixed:
+                fit_first True
+                add "naughty_list spacer" size (156, 21)
+                text "[i]" pos (6, 3)
+                text "[name]" xalign 0.5 yoffset 3

From 2956afe75a1e3bf6f2b3f4f5a8ae597694b092ef Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Sat, 17 Dec 2022 21:57:06 +0000
Subject: [PATCH 08/17] Bug Fixes

* Fixed decoration menu page swap arrow position
* Fixed room and title screen animations restarting with every interaction
---
 game/scripts/animations/common.rpy            |  4 +++
 game/scripts/interface/inventory.rpy          |  4 +--
 game/scripts/rooms/main_room/images.rpy       | 25 +++++++++++++++++++
 .../rooms/main_room/objects/weather.rpy       |  9 ++++++-
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/game/scripts/animations/common.rpy b/game/scripts/animations/common.rpy
index f1f0cb96..e02d1135 100644
--- a/game/scripts/animations/common.rpy
+++ b/game/scripts/animations/common.rpy
@@ -267,6 +267,7 @@ image sur:
 # Main title background animation
 image title_ani:
     contains:
+        animation
         zoom 0.5
         "images/title/00.webp"
         pause 3
@@ -318,6 +319,7 @@ image title_ani:
         "candle_fire_01"
 
     contains:
+        animation
         xpos -255
         ypos 100
         zoom 0.8
@@ -341,6 +343,7 @@ image title_ani:
 
     #sparkle
     contains:
+        animation
         xpos 798
         ypos 200
         xanchor 0.5
@@ -354,6 +357,7 @@ image title_ani:
 
     #shine silver (synchronized)
     contains:
+        animation
         xpos 848
         ypos 230
         xanchor 0.5
diff --git a/game/scripts/interface/inventory.rpy b/game/scripts/interface/inventory.rpy
index 916f294b..515519a6 100644
--- a/game/scripts/interface/inventory.rpy
+++ b/game/scripts/interface/inventory.rpy
@@ -308,9 +308,9 @@ screen inventory_menuitem(xx, yy):
                         action Return("dec")
 
                 imagebutton:
-                    idle Transform(gui.format("interface/frames/{}/arrow_up.webp"), xzoom=-1)
+                    idle Transform(gui.format("interface/frames/{}/arrow_up.webp"), yzoom=-1)
                     if current_page < math.ceil((menu_items_length-1)/items_shown):
-                        hover Transform(image_hover(gui.format("interface/frames/{}/arrow_up.webp")), xzoom=-1)
+                        hover Transform(image_hover(gui.format("interface/frames/{}/arrow_up.webp")), yzoom=-1)
                         action Return("inc")
 
         # Add items
diff --git a/game/scripts/rooms/main_room/images.rpy b/game/scripts/rooms/main_room/images.rpy
index 24d8fe53..8b719696 100644
--- a/game/scripts/rooms/main_room/images.rpy
+++ b/game/scripts/rooms/main_room/images.rpy
@@ -1,5 +1,6 @@
 
 image fireplace_fire:
+    animation
     offset (-24, -6)
     "images/rooms/objects/fireplace/fireplace_fire_01.webp"
     pause.1
@@ -20,6 +21,7 @@ image fireplace_fire:
     repeat
 
 image glow_effect:
+    animation
     "images/animation/glow_effect/glow_1.webp"
     pause.1
     "images/animation/glow_effect/glow_2.webp"
@@ -51,6 +53,7 @@ image glow_effect_fireplace:
     "glow_effect"
 
 image candle_fire_01:
+    animation
     "images/rooms/objects/candles/fire_01.webp"
     pause.1
     "images/rooms/objects/candles/fire_02.webp"
@@ -79,6 +82,7 @@ image candle_fire_01:
     repeat
 
 image candle_fire_02:
+    animation
     "images/rooms/objects/candles/fire_01.webp"
     pause.1
     "images/rooms/objects/candles/fire_04.webp"
@@ -107,6 +111,7 @@ image candle_fire_02:
     repeat
 
 image phoenix_idle:
+    animation
     zoom 0.5
 
     "images/rooms/objects/phoenix/phoenix_01.webp"
@@ -135,6 +140,7 @@ image phoenix_hover:
     "images/rooms/objects/phoenix/phoenix_hover.webp"
 
 image phoenix_feather:
+    animation
     zoom 0.5
     pause 10
     alpha 1.0
@@ -208,6 +214,7 @@ image fireplace_hover:
     "images/rooms/objects/fireplace/fireplace_hover.webp"
 
 image owl_idle:
+    animation
     zoom 0.5
 
     "images/rooms/objects/mail/owl_idle_01.webp"
@@ -223,6 +230,7 @@ image owl_idle:
     repeat
 
 image owl_letter:
+    animation
     zoom 0.5
 
     "images/rooms/objects/mail/owl_01.webp"
@@ -272,6 +280,7 @@ image candle_right:
     "images/rooms/objects/candles/candle.webp"
 
 image candle_fire: #Candle fire.
+    animation
     "images/rooms/objects/candles/fire_01.webp"
     pause.1
     "images/rooms/objects/candles/fire_04.webp"
@@ -337,6 +346,7 @@ image desk_dumbledore:
     "images/rooms/main_room/dum.webp"
 
 image halloween_chandelier:
+    animation
 
     contains:
         anchor (0.5, 0.0)
@@ -364,6 +374,7 @@ image halloween_fireplace_jackolanterns:
     "images/rooms/objects/decorations/halloween_fireplace2.webp"
 
 image halloween_window_monster:
+    animation
     "images/rooms/objects/decorations/halloween_monster/0.webp"
     pause 3
     "images/rooms/objects/decorations/halloween_monster/1.webp"
@@ -409,6 +420,7 @@ image halloween_lamp_left_glow:
     offset (-111, -81)
 
     contains:
+        animation
         alpha 0.9
 
         "images/rooms/objects/decorations/halloween_lamp/glow.webp"
@@ -431,6 +443,7 @@ image halloween_lamp_right_glow:
     offset (-111, -81)
 
     contains:
+        animation
         alpha 0.9
 
         "images/rooms/objects/decorations/halloween_lamp/glow.webp"
@@ -553,6 +566,7 @@ image xmas_lights_alternate:
         "images/rooms/objects/decorations/xmas_lights/underlay.webp"
 
     contains:
+        animation
         alpha 1.0
         "xmas_lights_set1_bulbs"
         linear 0.5 alpha 0.5
@@ -560,6 +574,7 @@ image xmas_lights_alternate:
         repeat
 
     contains:
+        animation
         alpha 0.5
         "xmas_lights_set2_bulbs"
         linear 0.5 alpha 1.0
@@ -570,6 +585,7 @@ image xmas_lights_alternate:
         "images/rooms/objects/decorations/xmas_lights/base.webp"
 
     contains:
+        animation
         alpha 1.0
         "xmas_lights_set1_glow"
         linear 0.5 alpha 0.0
@@ -577,6 +593,7 @@ image xmas_lights_alternate:
         repeat
 
     contains:
+        animation
         alpha 0.0
         "xmas_lights_set2_glow"
         linear 0.5 alpha 1.0
@@ -589,12 +606,14 @@ image xmas_lights_cycle:
         "images/rooms/objects/decorations/xmas_lights/underlay.webp"
 
     contains:
+        animation
         matrixcolor HueMatrix(0)
         "xmas_lights_set1_bulbs"
         linear 18.0 matrixcolor HueMatrix(360)
         repeat
 
     contains:
+        animation
         matrixcolor HueMatrix(0)
         "xmas_lights_set2_bulbs"
         linear 18.0 matrixcolor HueMatrix(360)
@@ -604,12 +623,14 @@ image xmas_lights_cycle:
         "images/rooms/objects/decorations/xmas_lights/base.webp"
 
     contains:
+        animation
         matrixcolor HueMatrix(0)
         "xmas_lights_set1_glow"
         linear 18.0 matrixcolor HueMatrix(360)
         repeat
 
     contains:
+        animation
         matrixcolor HueMatrix(0)
         "xmas_lights_set2_glow"
         linear 18.0 matrixcolor HueMatrix(360)
@@ -621,6 +642,7 @@ image xmas_lights_pulse:
         "images/rooms/objects/decorations/xmas_lights/underlay.webp"
 
     contains:
+        animation
         alpha 1.0
         "xmas_lights_set1_bulbs"
         easeout 3.5 alpha 0.0
@@ -630,6 +652,7 @@ image xmas_lights_pulse:
         repeat
 
     contains:
+        animation
         alpha 1.0
         "xmas_lights_set2_bulbs"
         easeout 3.5 alpha 0.0
@@ -642,6 +665,7 @@ image xmas_lights_pulse:
         "images/rooms/objects/decorations/xmas_lights/base.webp"
 
     contains:
+        animation
         alpha 1.0
         "xmas_lights_set1_glow"
         easeout 3.5 alpha 0.0
@@ -651,6 +675,7 @@ image xmas_lights_pulse:
         repeat
 
     contains:
+        animation
         alpha 1.0
         "xmas_lights_set2_glow"
         easeout 3.5 alpha 0.0
diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy
index ac342830..487e9f9c 100644
--- a/game/scripts/rooms/main_room/objects/weather.rpy
+++ b/game/scripts/rooms/main_room/objects/weather.rpy
@@ -59,6 +59,7 @@ image weather_cloudy_clouds = ConditionSwitch(
     )
 
 image weather_cloudy_fx:
+    animation
     "weather_cloudy_clouds"
     choice:
         pos (-100, 0)
@@ -74,6 +75,7 @@ image weather_cloudy_fx:
 image weather_cloudy = Fixed("weather_clear", "weather_cloudy_fx", fit_first=True)
 
 image weather_rain_fx:
+    animation
     "images/rooms/_weather_/rain_01.webp"
     pause.1
     "images/rooms/_weather_/rain_02.webp"
@@ -85,6 +87,7 @@ image weather_rain_fx:
 image weather_rain = Fixed("weather_overcast", "weather_rain_fx", fit_first=True)
 
 image weather_snow_fx:
+    animation
     "images/rooms/_weather_/snow_01.webp"
     pause.07
     "images/rooms/_weather_/snow_02.webp"
@@ -110,6 +113,7 @@ image weather_snow_fx:
 image weather_snow = Fixed("weather_overcast", "weather_snow_fx", fit_first=True)
 
 image weather_blizzard_fx:
+    animation
     "images/rooms/_weather_/blizzard_01.webp"
     pause.05
     "images/rooms/_weather_/blizzard_02.webp"
@@ -135,8 +139,10 @@ image weather_blizzard_fx:
 image weather_blizzard= Fixed("weather_overcast", "weather_blizzard_fx", fit_first=True)
 
 image weather_storm_fx:
+    animation
 
     parallel:
+        animation
         pause 20
         "images/rooms/_weather_/lightning_01.webp"
         pause.1
@@ -159,6 +165,7 @@ image weather_storm_fx:
         repeat
 
     parallel:
+        animation
         "images/rooms/_weather_/rain_01.webp"
         pause.1
         "images/rooms/_weather_/rain_02.webp"
@@ -167,4 +174,4 @@ image weather_storm_fx:
         pause.1
         repeat
 
-image weather_storm= Fixed("weather_overcast", "weather_storm_fx", fit_first=True)
+image weather_storm = Fixed("weather_overcast", "weather_storm_fx", fit_first=True)

From b38147852af0cf7808106be37ead0c7d1b2771b6 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Tue, 20 Dec 2022 22:54:47 +0000
Subject: [PATCH 09/17] Bug fix

* Fixed naughty list username retrieval failing on Windows
---
 .../rooms/main_room/objects/poster.rpy        | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/game/scripts/rooms/main_room/objects/poster.rpy b/game/scripts/rooms/main_room/objects/poster.rpy
index 1687f688..b4af2a1c 100644
--- a/game/scripts/rooms/main_room/objects/poster.rpy
+++ b/game/scripts/rooms/main_room/objects/poster.rpy
@@ -17,19 +17,31 @@ default naughty_list_commentary = False
 label naughty_list:
 
     python:
+        # This code retrieves user name and displays it on a leaderboard-like
+        # list for funsies, the variable is discarded afterwards.
         _username = None
         _d = [(i, get_character_progression(i)) for i in CHARACTERS if get_character_unlock(i)]
         _d.append(["Snape", sna_friendship])
 
         try:
-            _username = os.getlogin().split(" ")[0].capitalize()
+            _username = os.getenv("USERNAME")
+
+            if not _username:
+                _username = os.getlogin()
+
+            # Windows returns an empty string when it encounters an error,
+            # in ucrtbase.dll, and we need to catch that.
+            if not _username:
+                raise Exception("Cannot retrieve user name, using the fallback.")
+
+            _username = _username.split(" ")[0].capitalize()
             _d.append([_username, 999])
+
         except:
             _d.append(["Genie", 999])
 
         _d.sort(key=lambda x: x[1], reverse=True)
 
-
     show screen naughty_list(_d)
     with d3
 
@@ -38,16 +50,19 @@ label naughty_list:
 
         pause 1.0
 
-        if _username:
-            gen "List checks out... But who the fuck is [_username]?" ("base", xpos="far_left", ypos="head")
-        else:
+        if _username is None:
             gen "I'm on the first place, nice!" ("base", xpos="far_left", ypos="head")
+        else:
+            gen "List checks out... But who the fuck is [_username]?" ("base", xpos="far_left", ypos="head")
 
     call ctc
 
     hide screen naughty_list
     with d3
 
+    python:
+        del _username
+
     jump main_room_menu
 
 screen naughty_list(d):

From 860212b5e1c2065d161027bb5e450fda3eb4fca5 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Wed, 21 Dec 2022 20:38:20 +0000
Subject: [PATCH 10/17] Xmas Story

* Added new Genie Stripper Santa Outfit.
* Added experimental Genie Outfit cheat.
* Refactored santa speaker to utilize a single `gen` speaker and applied the change to all affected events.
* Improved base Genie model, the default robes outfit and image creation code.
---
 game/characters/genie/base.webp               |  4 +-
 game/characters/genie/beard.webp              |  3 +
 game/characters/genie/outfits/robes.webp      |  3 +
 .../characters/genie/outfits/robes_beard.webp |  3 +
 game/characters/genie/outfits/santa.webp      |  3 +
 .../genie/outfits/santa_beard_angry.webp      |  3 +
 .../genie/outfits/santa_beard_base.webp       |  3 +
 .../genie/outfits/santa_beard_grin.webp       |  3 +
 .../genie/outfits/santa_beard_open.webp       |  3 +
 .../genie/outfits/santa_beard_smile.webp      |  3 +
 game/characters/genie/robes.webp              |  3 -
 game/characters/genie/robes_fix.webp          |  3 -
 game/scripts/characters.rpy                   |  9 ---
 game/scripts/characters/genie/wardrobe.rpy    | 18 ++++--
 game/scripts/interface/cheats.rpy             | 19 +++++++
 .../mirror/events/a_christmas_tale.rpy        | 18 +++---
 .../mirror/events/a_christmas_tale2.rpy       | 56 +++++++++----------
 .../mirror/events/a_white_christmas.rpy       |  2 +-
 .../mirror/events/genies_christmas_wish.rpy   | 10 ++--
 19 files changed, 103 insertions(+), 66 deletions(-)
 create mode 100644 game/characters/genie/beard.webp
 create mode 100644 game/characters/genie/outfits/robes.webp
 create mode 100644 game/characters/genie/outfits/robes_beard.webp
 create mode 100644 game/characters/genie/outfits/santa.webp
 create mode 100644 game/characters/genie/outfits/santa_beard_angry.webp
 create mode 100644 game/characters/genie/outfits/santa_beard_base.webp
 create mode 100644 game/characters/genie/outfits/santa_beard_grin.webp
 create mode 100644 game/characters/genie/outfits/santa_beard_open.webp
 create mode 100644 game/characters/genie/outfits/santa_beard_smile.webp
 delete mode 100644 game/characters/genie/robes.webp
 delete mode 100644 game/characters/genie/robes_fix.webp

diff --git a/game/characters/genie/base.webp b/game/characters/genie/base.webp
index 9253162b..b30dac7a 100644
--- a/game/characters/genie/base.webp
+++ b/game/characters/genie/base.webp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0484d04fcbf27cf86e56800bf03e62edfa0417f060a257b1d30f87902a425ef
-size 218008
+oid sha256:250449ae16d33b43148b9d4d18506d3faf1738f7c06df4a0bfa8967073210800
+size 216480
diff --git a/game/characters/genie/beard.webp b/game/characters/genie/beard.webp
new file mode 100644
index 00000000..f32a1c67
--- /dev/null
+++ b/game/characters/genie/beard.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a53dffc1c42a1fe081df634cbcdcd0991979dcade9f3d992fefba90ad0ee3057
+size 6166
diff --git a/game/characters/genie/outfits/robes.webp b/game/characters/genie/outfits/robes.webp
new file mode 100644
index 00000000..11b988d6
--- /dev/null
+++ b/game/characters/genie/outfits/robes.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c1c4ed5e3842b361c1ca1af5eeb3e5e9c9315d6a8c90c318f7898ecf554ded5
+size 395224
diff --git a/game/characters/genie/outfits/robes_beard.webp b/game/characters/genie/outfits/robes_beard.webp
new file mode 100644
index 00000000..f32a1c67
--- /dev/null
+++ b/game/characters/genie/outfits/robes_beard.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a53dffc1c42a1fe081df634cbcdcd0991979dcade9f3d992fefba90ad0ee3057
+size 6166
diff --git a/game/characters/genie/outfits/santa.webp b/game/characters/genie/outfits/santa.webp
new file mode 100644
index 00000000..53f26f2f
--- /dev/null
+++ b/game/characters/genie/outfits/santa.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7b3317f21f0140149fe6ff5265eceeb83d4972a70d6b6c53f8810a9cf32d603
+size 433864
diff --git a/game/characters/genie/outfits/santa_beard_angry.webp b/game/characters/genie/outfits/santa_beard_angry.webp
new file mode 100644
index 00000000..83730a2d
--- /dev/null
+++ b/game/characters/genie/outfits/santa_beard_angry.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab75c9dbcb03f0a78baa25c13b96eb780cc9a672a0d6b12aff79a4e45e8d2db5
+size 51918
diff --git a/game/characters/genie/outfits/santa_beard_base.webp b/game/characters/genie/outfits/santa_beard_base.webp
new file mode 100644
index 00000000..937d8a1d
--- /dev/null
+++ b/game/characters/genie/outfits/santa_beard_base.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5672a51afac6a00e21096c069e8815d07fbc09baf2d841dc4a4054f33409c654
+size 51880
diff --git a/game/characters/genie/outfits/santa_beard_grin.webp b/game/characters/genie/outfits/santa_beard_grin.webp
new file mode 100644
index 00000000..aad06406
--- /dev/null
+++ b/game/characters/genie/outfits/santa_beard_grin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09fb7071cd1f8684b6438efa97c40b3667e32ee0bb4d555c4fa81e9f0ed9afca
+size 52344
diff --git a/game/characters/genie/outfits/santa_beard_open.webp b/game/characters/genie/outfits/santa_beard_open.webp
new file mode 100644
index 00000000..b09dff5c
--- /dev/null
+++ b/game/characters/genie/outfits/santa_beard_open.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee1732655493fceb707ca24dd1c78522834f94a06d07132dd5fca350079c6cda
+size 52894
diff --git a/game/characters/genie/outfits/santa_beard_smile.webp b/game/characters/genie/outfits/santa_beard_smile.webp
new file mode 100644
index 00000000..427b0929
--- /dev/null
+++ b/game/characters/genie/outfits/santa_beard_smile.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:beed64f6c5cff84a6d0982de5b5ce702cd1d134555060a7162ac61ac155c65ea
+size 53502
diff --git a/game/characters/genie/robes.webp b/game/characters/genie/robes.webp
deleted file mode 100644
index 3d1633eb..00000000
--- a/game/characters/genie/robes.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7145c4b0b13f2bea60f37e8108b80b1cceb4d42d1a19a512da2d88c9df2cd9b
-size 391566
diff --git a/game/characters/genie/robes_fix.webp b/game/characters/genie/robes_fix.webp
deleted file mode 100644
index 39949277..00000000
--- a/game/characters/genie/robes_fix.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c717d6968ad8c8c2c8b4cd7140523a6972100c2c23009b1bad6b6750f42603e
-size 14424
diff --git a/game/scripts/characters.rpy b/game/scripts/characters.rpy
index 8dbea8ab..ab0ae54c 100644
--- a/game/scripts/characters.rpy
+++ b/game/scripts/characters.rpy
@@ -79,12 +79,3 @@ define dum2 = Character("[dumbledore_name]", show_side_image=Image("characters/m
 define dum3 = Character("[dumbledore_name]", show_side_image=Image("characters/misc/dumbledore/dum_3.webp"), show_icon="dumbledore")
 define dum4 = Character("[dumbledore_name]", show_side_image=Image("characters/misc/dumbledore/dum_4.webp"), show_icon="dumbledore")
 define dum5 = Character("[dumbledore_name]", show_side_image=Image("characters/misc/dumbledore/dum_5.webp"), show_icon="dumbledore")
-
-# Santa
-define san1 = Character("Santa", show_side_image=Image("characters/misc/santa/santa_1.webp"), show_icon="santa")
-define san2 = Character("Santa", show_side_image=Image("characters/misc/santa/santa_2.webp"), show_icon="santa")
-define san3 = Character("Santa", show_side_image=Image("characters/misc/santa/santa_3.webp"), show_icon="santa")
-define san4 = Character("Santa", show_side_image=Image("characters/misc/santa/santa_4.webp"), show_icon="santa")
-define san5 = Character("Santa", show_side_image=Image("characters/misc/santa/santa_5.webp"), show_icon="santa")
-define san6 = Character("Santa", show_side_image=Image("characters/misc/santa/santa_6.webp"), show_icon="santa")
-define san7 = Character("Santa", show_side_image=Image("characters/misc/santa/santa_7.webp"), show_icon="santa")
diff --git a/game/scripts/characters/genie/wardrobe.rpy b/game/scripts/characters/genie/wardrobe.rpy
index beb78f20..ebe200e5 100644
--- a/game/scripts/characters/genie/wardrobe.rpy
+++ b/game/scripts/characters/genie/wardrobe.rpy
@@ -36,22 +36,28 @@ layeredimage genie:
     group hair:
         attribute nude "characters/genie/hair.webp"
 
-    group fixes:
-        attribute robes "characters/genie/robes_fix.webp"
-
     always "characters/genie/base.webp"
 
     group face:
-        attribute base Null()
+        attribute base default Null()
         attribute grin "characters/genie/grin.webp"
         attribute angry "characters/genie/angry.webp"
         attribute smile "characters/genie/smile.webp"
         attribute open "characters/genie/open.webp"
 
     group outfit:
-
         attribute nude Null()
-        attribute robes default "characters/genie/robes.webp"
+        attribute robes default "characters/genie/outfits/robes.webp"
+        attribute santa "characters/genie/outfits/santa.webp"
+
+    group beard multiple:
+        attribute nude default "characters/genie/beard.webp" if_all ["nude"]
+        attribute robes default "characters/genie/outfits/robes_beard.webp" if_all ["robes"]
+        attribute santa_base default "characters/genie/outfits/santa_beard_base.webp" if_all ["santa", "base"]
+        attribute santa_grin default "characters/genie/outfits/santa_beard_grin.webp" if_all ["santa", "grin"]
+        attribute santa_angry default "characters/genie/outfits/santa_beard_angry.webp" if_all ["santa", "angry"]
+        attribute santa_smile default "characters/genie/outfits/santa_beard_smile.webp" if_all ["santa", "smile"]
+        attribute santa_open default "characters/genie/outfits/santa_beard_open.webp" if_all ["santa", "open"]
 
     at Transform(function=genie_transform)
 
diff --git a/game/scripts/interface/cheats.rpy b/game/scripts/interface/cheats.rpy
index 549dc707..355ab861 100644
--- a/game/scripts/interface/cheats.rpy
+++ b/game/scripts/interface/cheats.rpy
@@ -302,6 +302,25 @@ label cheats:
                         jump cheats
 
             menu:
+                "-Genie Outfits-":
+                    label .genie:
+                    menu:
+                        "-Use Default Outfit":
+                            show genie robes
+                            hide genie
+                            with None
+
+                            gen robes "Swag." ("grin", xpos="far_left", ypos="head")
+                        "-Use Santa Outfit":
+                            show genie santa
+                            hide genie
+                            with None
+
+                            gen santa "Cool." ("grin", xpos="far_left", ypos="head")
+                            ">Disclaimer: Outfits will not be displayed during CG scenes and for chibi animations."
+                        "-Back-":
+                            jump cheats.characters
+                    jump cheats.genie
                 "{size=-4}-Wardrobe Transparency Slider- (Is enabled: [cheat_wardrobe_alpha]){/size}" (icon="interface/icons/small/wardrobe.webp"):
                     $ cheat_wardrobe_alpha = not cheat_wardrobe_alpha
 
diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale.rpy
index 65ea68ff..36378bff 100644
--- a/game/scripts/minigames/mirror/events/a_christmas_tale.rpy
+++ b/game/scripts/minigames/mirror/events/a_christmas_tale.rpy
@@ -90,11 +90,11 @@ label a_christmas_tale:
 
     show screen bld1
     with d3
-    san1 "Oh hello there my friend."
+    gen santa "Oh hello there my friend." ("base", xpos="far_left", ypos="head")
     nar "Said the figure at last."
-    san1 "I thought you might be here, but where's that genie?"
+    gen "I thought you might be here, but where's that genie?" ("base", xpos="far_left", ypos="head")
     sna "..." (face="snape_25")
-    san1 "Blast..."
+    gen "Blast..." ("base", xpos="far_left", ypos="head")
 
     sna "Genie..." (face="snape_24")
     nar "Said the teacher."
@@ -102,16 +102,16 @@ label a_christmas_tale:
     sna "Have you been drinking again?" (face="snape_25")
     sna "And I don't mean drinking tea." (face="snape_29")
 
-    san1 "I don't know what you mean."
+    gen "I don't know what you mean." ("base", xpos="far_left", ypos="head")
     nar "Said the large bearded man..."
-    san2 "I'm Santa of course."
-    san2 "I bring presents..."
-    san2 "That's the plan!"
+    gen "I'm Santa of course." ("grin", xpos="far_left", ypos="head")
+    gen "I bring presents..." ("grin", xpos="far_left", ypos="head")
+    gen "That's the plan!" ("grin", xpos="far_left", ypos="head")
     pause.8
 
     nar "After silence and confusion then Severus said..."
     sna "Well, just get it over with so I can go back to bed." (face="snape_09")
-    san1 "Now boy where's your spirit, it's Christmas is it not?"
+    gen "Now boy where's your spirit, it's Christmas is it not?" ("base", xpos="far_left", ypos="head")
     sna "Now genie, look here..." (face="snape_24")
     nar "But then he froze on the spot."
 
@@ -177,7 +177,7 @@ label a_christmas_tale:
     with d5
     pause.8
 
-    san4 "Happy Holidays."
+    gen "Happy Holidays." ("grin", xpos="far_left", ypos="head")
 
     show screen blkfade
     with d9
diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
index fe78eee1..6a125a8c 100644
--- a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
+++ b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy
@@ -85,23 +85,23 @@ label a_christmas_tale2():
     with d3
     sna "Genie of course... You think I'd fall for that fake beard?" ("snape_05", trans=d3)
 
-    san1 "I think you must be mistaken."
+    gen santa "I think you must be mistaken." ("base", xpos="far_left", ypos="head")
     hide snape_main
     hide screen bld1
     with d3
     nar "Said Santa to the man."
     show screen bld1
     with d3
-    san1 "I'm not Genie, I'm Santa!"
-    san1 "I deliver presents!"
-    san2 "That's the plan!"
+    gen "I'm not Genie, I'm Santa!" ("base", xpos="far_left", ypos="head")
+    gen "I deliver presents!" ("base", xpos="far_left", ypos="head")
+    gen "That's the plan!" ("grin", xpos="far_left", ypos="head")
 
-    san1 "I bring cheers and presents, to all across the land."
+    gen "I bring cheers and presents, to all across the land." ("base", xpos="far_left", ypos="head")
     sna "Are you sure about that? I don't see a sack in your hand..." ("snape_01", trans=d3)
     hide snape_main
     with d3
-    san1 "Be patient dear boy... Don't you give me that face."
-    san1 "Your gift will get here soon through this office fireplace."
+    gen "Be patient dear boy... Don't you give me that face." ("base", xpos="far_left", ypos="head")
+    gen "Your gift will get here soon through this office fireplace." ("base", xpos="far_left", ypos="head")
     hide screen bld1
     with d3
 
@@ -113,7 +113,7 @@ label a_christmas_tale2():
 
     show screen bld1
     with d3
-    san2 "Now check out this girl!"
+    gen "Now check out this girl!" ("grin", xpos="far_left", ypos="head")
 
     ton "" ("horny", "narrow", "base", "mid", hair="happy", xpos="mid", ypos="base", trans=d3)
     call ctc
@@ -121,12 +121,12 @@ label a_christmas_tale2():
     sna "Now that is a present!" ("snape_13", trans=d3)
     sna "You've outdone yourself." ("snape_20")
     hide snape_main
-    san1 "That's not your present, that's my sexy helper elf..."
+    gen "That's not your present, that's my sexy helper elf..." ("base", xpos="far_left", ypos="head")
 
     ton "Eye's up here boy..." ("base", "base", "base", "mid", hair="happy", trans=dissolve)
     ton "Your present is in this sack..." ("soft", "narrow", "base", "down", hair="happy")
     ton "These milkers belong to Santa!" ("horny", "narrow", "base", "L", hair="horny")
-    san2 "They're my after-work Christmas snack!"
+    gen "They're my after-work Christmas snack!" ("grin", xpos="far_left", ypos="head")
 
     hide tonks_main
     hide screen bld1
@@ -156,20 +156,20 @@ label a_christmas_tale2():
     sna "Now that's a proper present!" ("snape_13", trans=d3)
     hide snape_main
     with d3
-    san2 "Now unwrap those naughty bits!"
+    gen "Now unwrap those naughty bits!" ("grin", xpos="far_left", ypos="head")
 
     ton "Wait, I just remembered, don't unwrap the present yet!" ("mad", "shocked", "base", "L", hair="happy", trans=dissolve)
     ton "If he's not been good this year then a gift he cannot get." ("open", "closed", "shocked", "mid", hair="happy")
     hide tonks_main
     with d3
 
-    san2 "I'm certain he's been good... Now unwrap her I insist!"
+    gen "I'm certain he's been good... Now unwrap her I insist!" ("grin", xpos="far_left", ypos="head")
 
     ton "I'm not so sure myself... His offences fill this list." ("upset", "narrow", "base", "down", hair="happy", trans=dissolve)
     hide tonks_main
     with d3
 
-    san1 "Then read it for me elf... I'm sure it will be quick..."
+    gen "Then read it for me elf... I'm sure it will be quick..." ("base", xpos="far_left", ypos="head")
     hide screen bld1
     with d3
     nar "The elf then unrolled it... A scroll six inches thick."
@@ -182,7 +182,7 @@ label a_christmas_tale2():
     hide hermione_main
     with d3
 
-    san1 "That can't be true!"
+    gen "That can't be true!" ("base", xpos="far_left", ypos="head")
     sna "Mere fabrications that, indeed..." ("snape_35", trans=d3)
     hide snape_main
     with d3
@@ -198,25 +198,25 @@ label a_christmas_tale2():
     with d3
 
     ton "So is slapping their ass..." ("disgust", "narrow", "base", "mid", hair="happy")
-    san1 "Well I'm sure they're all right... It was only a slap..."
+    gen "Well I'm sure they're all right... It was only a slap..." ("base", xpos="far_left", ypos="head")
     ton "I'm not done yet santa, there's more..." ("annoyed", "narrow", "base", "L", hair="happy")
-    san1 "What the crap..."
+    gen "What the crap..." ("base", xpos="far_left", ypos="head")
 
     ton "Stealing mounds of sweets and sniffing girls hair..." ("normal", "base", "raised", "down", hair="happy")
     sna "Now let's be reasonable for a minute, this list isn't fair!" ("snape_18", trans=d3)
     hide snape_main
     with d3
 
-    san1 "I think he's got a point, at least he didn't curse..."
+    gen "I think he's got a point, at least he didn't curse..." ("base", xpos="far_left", ypos="head")
     ton "You say that but now, is when the list is getting worse..." ("disgust", "base", "base", "mid", hair="happy")
 
     ton "He's bought blowjobs with house points... Now that doesn't sound great..." ("open", "narrow", "base", "down", hair="happy")
-    san2 "A misprint I'm sure!"
+    gen "A misprint I'm sure!" ("grin", xpos="far_left", ypos="head")
     ton "The list says thirty-eight..." ("mad", "wide", "base", "down", hair="happy")
 
     ton "Wrapped around his finger... This is making me sick..." ("upset", "base", "base", "down", hair="upset")
     ton "This list is massive!" ("clench", "wide", "annoyed", "down", hair="angry")
-    san1 "Then just skim it real quick..."
+    gen "Then just skim it real quick..." ("base", xpos="far_left", ypos="head")
 
     ton "Taking girls books and replacing it with smut..." ("disgust", "narrow", "base", "down", hair="happy")
     ton "Then punishing them for it by spanking their butt..." ("annoyed", "narrow", "annoyed", "mid", hair="happy")
@@ -232,26 +232,26 @@ label a_christmas_tale2():
     ton "Spying in the toilets..." ("disgust", "narrow", "base", "down", hair="disgusted")
     ton "Never knocks on any doors..." ("open", "closed", "base", "mid", hair="happy")
 
-    san1 "Never knocks on any doors?!"
+    gen "Never knocks on any doors?!" ("base", xpos="far_left", ypos="head")
     nar "Said Santa at last."
-    san1 "Now that's a big offence!"
+    gen "Now that's a big offence!" ("base", xpos="far_left", ypos="head")
     ton "You really think so Santa?" ("annoyed", "wide", "raised", "mid", hair="happy")
     sna "Blast..." ("snape_11", trans=d3)
     hide snape_main
     with d3
 
-    san1 "Sexual acts is one thing... But not knocking on doors!"
-    san1 "A man without manners is what Santa Claus abhors."
-    san1 "I can't give you a gift but I offer this advice."
-    san1 "Most things I will ignore but good manners deem you nice."
+    gen "Sexual acts is one thing... But not knocking on doors!" ("base", xpos="far_left", ypos="head")
+    gen "A man without manners is what Santa Claus abhors." ("base", xpos="far_left", ypos="head")
+    gen "I can't give you a gift but I offer this advice." ("base", xpos="far_left", ypos="head")
+    gen "Most things I will ignore but good manners deem you nice." ("base", xpos="far_left", ypos="head")
 
-    san1 "Now ladies it's time to leave, it is a busy time of year..."
-    san1 "Let us empty this sack and spread my Christmas cheer."
+    gen "Now ladies it's time to leave, it is a busy time of year..." ("base", xpos="far_left", ypos="head")
+    gen "Let us empty this sack and spread my Christmas cheer." ("base", xpos="far_left", ypos="head")
     ton "This meeting took way too long so we better spread it quick..." ("mad", "base", "base", "L", hair="happy")
     ton "I hope I get overtime for this..." ("annoyed", "base", "base", "R", hair="happy")
     hide tonks_main
     with d3
-    san2 "I'll let you ride my magic di--"
+    gen "I'll let you ride my magic di--" ("grin", xpos="far_left", ypos="head")
 
     call gen_chibi("hide")
     #call ton_chibi("hide")
diff --git a/game/scripts/minigames/mirror/events/a_white_christmas.rpy b/game/scripts/minigames/mirror/events/a_white_christmas.rpy
index c03209ef..b30f8c78 100644
--- a/game/scripts/minigames/mirror/events/a_white_christmas.rpy
+++ b/game/scripts/minigames/mirror/events/a_white_christmas.rpy
@@ -369,6 +369,6 @@ label a_white_christmas:
     gen "Aaaah!"
     nar "Ball disintegration."
 
-    san4 "Happy Holidays."
+    gen santa "Happy Holidays." ("grin", xpos="far_left", ypos="head")
 
     $ renpy.end_replay()
diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
index 19a2371a..44c46692 100644
--- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -127,7 +127,7 @@ label genies_christmas_wish:
 
     nar "His eyes now shut, as they had been sprayed by magic sand."
 
-    gen "My eyes!" ("open", xpos="far_left", ypos="head")
+    gen santa "My eyes!" ("open", xpos="far_left", ypos="head")
     nar "He yelled loudly... His vision now impaired."
     gen "This better not be permanent!" ("angry", xpos="far_left", ypos="head")
     nar "He said, his tone sounding a bit scared."
@@ -221,14 +221,14 @@ label genies_christmas_wish:
     nar "One of them asked, as a tear escaped genie's eye."
     gen "A Christmas filled with sex... Now that is enough, to make a grown man cry." ("base", xpos="far_left", ypos="head")
 
-    san4 "The end!"
+    gen santa "The End!" ("grin", xpos="far_left", ypos="head")
 
     show screen blkfade
     with d4
 
-    cho "Why was I even in this story? We don't even celebrate Christmas at my home."
-    san3 "*Err*..."
+    cho robes "Why was I even in this story? We don't even celebrate Christmas at my home."
+    gen "*Err*..." ("open", xpos="far_left", ypos="head")
 
-    san4 "Merry Christmas!"
+    gen santa "Happy Holidays!" ("smile", xpos="far_left", ypos="head")
 
     $ renpy.end_replay()

From 08c347a3212b9003becb1eb412d451d10e03f2c6 Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Thu, 22 Dec 2022 15:40:50 +0100
Subject: [PATCH 11/17] fix

---
 .../minigames/mirror/events/genies_christmas_wish.rpy       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
index 44c46692..72cb0b81 100644
--- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -127,7 +127,7 @@ label genies_christmas_wish:
 
     nar "His eyes now shut, as they had been sprayed by magic sand."
 
-    gen santa "My eyes!" ("open", xpos="far_left", ypos="head")
+    gen "My eyes!" ("open", xpos="far_left", ypos="head")
     nar "He yelled loudly... His vision now impaired."
     gen "This better not be permanent!" ("angry", xpos="far_left", ypos="head")
     nar "He said, his tone sounding a bit scared."
@@ -226,9 +226,9 @@ label genies_christmas_wish:
     show screen blkfade
     with d4
 
-    cho robes "Why was I even in this story? We don't even celebrate Christmas at my home."
+    cho "Why was I even in this story? We don't even celebrate Christmas at my home." ("open", "base", "base", "mid")
     gen "*Err*..." ("open", xpos="far_left", ypos="head")
 
-    gen santa "Happy Holidays!" ("smile", xpos="far_left", ypos="head")
+    gen "Happy Holidays!" ("smile", xpos="far_left", ypos="head")
 
     $ renpy.end_replay()

From c7be1497f9e4ec3db4d952ff9138d971226e4ab1 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Thu, 22 Dec 2022 23:38:17 +0000
Subject: [PATCH 12/17] Revert "Virgin Killer outfit"

---
 .../cho/clothes/top/virgin_killer_top/0.webp  |  3 --
 .../cho/clothes/top/virgin_killer_top/1.webp  |  3 --
 .../top/virgin_killer_top/outline.webp        |  3 --
 .../clothes/top/virgin_killer_top/skin.webp   |  3 --
 game/scripts/characters/cho/wardrobe.rpy      |  8 ----
 .../characters/cho/wardrobe_reactions.rpy     | 38 -------------------
 game/scripts/shops/dress/chitchats.rpy        |  9 -----
 7 files changed, 67 deletions(-)
 delete mode 100644 game/characters/cho/clothes/top/virgin_killer_top/0.webp
 delete mode 100644 game/characters/cho/clothes/top/virgin_killer_top/1.webp
 delete mode 100644 game/characters/cho/clothes/top/virgin_killer_top/outline.webp
 delete mode 100644 game/characters/cho/clothes/top/virgin_killer_top/skin.webp

diff --git a/game/characters/cho/clothes/top/virgin_killer_top/0.webp b/game/characters/cho/clothes/top/virgin_killer_top/0.webp
deleted file mode 100644
index 3830ea8b..00000000
--- a/game/characters/cho/clothes/top/virgin_killer_top/0.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ca95008f05054bb696b8beb0d4ce15030147f24d3a8c0f7277bed40b1b02e1a
-size 44372
diff --git a/game/characters/cho/clothes/top/virgin_killer_top/1.webp b/game/characters/cho/clothes/top/virgin_killer_top/1.webp
deleted file mode 100644
index 63f36002..00000000
--- a/game/characters/cho/clothes/top/virgin_killer_top/1.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58565edd687ce8ca9488ac5fe35c9df4daeda1c7df0befc4b134f4afd09d2d62
-size 2864
diff --git a/game/characters/cho/clothes/top/virgin_killer_top/outline.webp b/game/characters/cho/clothes/top/virgin_killer_top/outline.webp
deleted file mode 100644
index 310d33c2..00000000
--- a/game/characters/cho/clothes/top/virgin_killer_top/outline.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5cf889c43eb301c18e50bf921b2890a9df4d87cae41a364e34a577a31fcd8e3c
-size 20488
diff --git a/game/characters/cho/clothes/top/virgin_killer_top/skin.webp b/game/characters/cho/clothes/top/virgin_killer_top/skin.webp
deleted file mode 100644
index 55928d87..00000000
--- a/game/characters/cho/clothes/top/virgin_killer_top/skin.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7954e27ad9ef8ae73236acb86dc52a47beee27d14e23fd1c642a138d0c882c0e
-size 8684
diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy
index a98549aa..e03824b0 100644
--- a/game/scripts/characters/cho/wardrobe.rpy
+++ b/game/scripts/characters/cho/wardrobe.rpy
@@ -227,14 +227,6 @@ default cho_hat_bunny1 = DollCloth("cho", ("head", "headgear"), "headgear", "bun
 
 default cho_outfit_bunny = DollOutfit([cho_hair_ponytail1, cho_top_bunny1, cho_stockings_bunny1, cho_hat_bunny1], price=250, name="Sexy Bunny Costume", desc="A costume to turn you into the bunny equivalent of a neko.")
 
-###################
-## Virgin Killer ##
-###################
-
-default cho_top_virgin_killer = DollCloth("cho", ("upper body", "one-piece suits"), "top", "virgin_killer_top", [[222, 64, 71, 255], [222, 64, 71, 255]], blacklist=["panties", "bra"], zorder=7, level=15)
-
-default cho_outfit_virgin_killer = DollOutfit([cho_hair_ponytail1, cho_top_virgin_killer], price=200, name="Virgin Killer", desc="Disclaimer: Does not actually kill virgins.")
-
 ###########
 ## Other ##
 ###########
diff --git a/game/scripts/characters/cho/wardrobe_reactions.rpy b/game/scripts/characters/cho/wardrobe_reactions.rpy
index c0163521..5c9071f0 100644
--- a/game/scripts/characters/cho/wardrobe_reactions.rpy
+++ b/game/scripts/characters/cho/wardrobe_reactions.rpy
@@ -558,21 +558,6 @@ label cho_reaction_equip_outfit(item):
         cho "I'm fine, let me just put it on..." ("soft", "narrow", "base", "down", cheeks="blush")
         cho "" ("soft", "narrow", "base", "mid", cheeks="blush")
 
-    ###################
-    ## Virgin Killer ##
-    ###################
-    elif item == cho_outfit_virgin_killer: #req 14 (no bra, no panties)
-        gen "I've got this jumper I'd like you to put on." ("base", xpos="far_left", ypos="head")
-        cho "A jumper?" ("soft", "base", "base", "mid")
-        gen "Yup, is that surprising?." ("base", xpos="far_left", ypos="head")
-        cho "*Hmm*... I suppose I would've imagined something more--" ("open", "base", "base", "R")
-        gen "Here you go." ("base", xpos="far_left", ypos="head")
-        cho "Oh... It's one of those." ("open", "narrow", "base", "down", cheeks="blush")
-        gen "Do you like it?" ("base", xpos="far_left", ypos="head")
-        gen "I thought it would enhance your features." ("base", xpos="far_left", ypos="head")
-        cho "*Hmm*... If you say so..." ("base", "narrow", "base", "down", cheeks="blush")
-        cho "Alright, just give me a moment to put it on." ("base", "base", "base", "mid", cheeks="blush")
-
     # TODO: Blacklist fallbacks have to be added.
     return
 
@@ -960,29 +945,6 @@ label cho_reaction_equip_outfit_fail(item):
         gen "This isn't at all what I asked for!" ("angry", xpos="far_left", ypos="head")
         gen "I'm going to have to give that seamstress a piece of my mind!" ("angry", xpos="far_left", ypos="head")
         cho "..." ("disgust", "narrow", "base", "mid")
-
-    ###################
-    ## Virgin Killer ##
-    ###################
-    elif item == cho_outfit_virgin_killer: #req 14 (no bra, no panties)
-        gen "Ever heard of a virgin killer?" ("base", xpos="far_left", ypos="head")
-        cho "Can't say that I have, is it some kind of drink?" ("soft", "base", "base", "mid")
-        gen "Good guess, but no. It's a type of jumper." ("base", xpos="far_left", ypos="head")
-        cho "I see... Why are you telling me this?" ("open", "narrow", "raised", "mid")
-        gen "Well, I've heard that they're the rage these days, so I got you one." ("base", xpos="far_left", ypos="head")
-        cho "Oh, well, that's very kind of you." ("base", "base", "base", "mid")
-        gen "Here you go." ("base", xpos="far_left", ypos="head")
-        cho "..." ("disgust", "narrow", "base", "down")
-        cho "*Ehm*... Did you actually look at this before you decided to give it to me?" ("open", "narrow", "base", "down", cheeks="blush")
-        gen "Not really, why?" ("base", xpos="far_left", ypos="head")
-        cho "Well, it's a bit revealing." ("upset", "narrow", "base", "mid", cheeks="blush")
-        gen "What?! Really?" ("base", xpos="far_left", ypos="head")
-        gen "But I spent so much money on it!" ("base", xpos="far_left", ypos="head")
-        gen "Are you sure it's that bad?" ("base", xpos="far_left", ypos="head")
-        cho "Yeah, it's pretty bad alright." ("angry", "narrow", "base", "down", cheeks="blush")
-        gen "Well, I guess I'll have to try to return it... Damn!" ("base", xpos="far_left", ypos="head")
-        cho "" ("angry", "narrow", "base", "mid", cheeks="blush")
-
     else:
         $ random_number = renpy.random.randint(1, 5)
         if random_number == 1:
diff --git a/game/scripts/shops/dress/chitchats.rpy b/game/scripts/shops/dress/chitchats.rpy
index c31aebb0..116f7320 100644
--- a/game/scripts/shops/dress/chitchats.rpy
+++ b/game/scripts/shops/dress/chitchats.rpy
@@ -410,15 +410,6 @@ label purchase_outfit(item):
         gen "I want one of those sexy bunny outfits, the one you might see in a magazine." ("base", xpos="far_left", ypos="head")
         maf "I see."
         maf "Alright then, I'll see what I can do."
-    elif item == cho_outfit_virgin_killer:
-        gen "Virgin killer?" ("base", xpos="far_left", ypos="head")
-        maf "Not so much these days, but you should've seen me in my--"
-        maf "Oh, you're referring to the jumper."
-        gen "Of course, although now I'm more intrigued about--" ("base", xpos="far_left", ypos="head")
-        maf "I doubt that would be a good idea... You pay me by the hour, after all."
-        gen "... Alright then." ("base", xpos="far_left", ypos="head")
-        maf "I shall have your jumper ready as soon as possible."
-
 
     #
     # Astoria Greengrass

From e4c3c3e51dbc92e5835356adfb8d2f1608925655 Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Fri, 23 Dec 2022 02:09:10 +0100
Subject: [PATCH 13/17] Outfit

* Added Tonks Santa outfit.
* Added outfit unlock and Tonks to xmas Mirror story.
---
 .../tonks/clothes/bra/santa_bra/0.webp        |  3 +++
 .../tonks/clothes/bra/santa_bra/outline.webp  |  3 +++
 .../tonks/clothes/bra/santa_bra/skin.webp     |  3 +++
 .../clothes/panties/santa_panties/0.webp      |  3 +++
 .../panties/santa_panties/outline.webp        |  3 +++
 .../clothes/panties/santa_panties/skin.webp   |  3 +++
 .../tonks/clothes/top/santa_top/0.webp        |  3 +++
 .../tonks/clothes/top/santa_top/0_back.webp   |  3 +++
 .../tonks/clothes/top/santa_top/1.webp        |  3 +++
 .../tonks/clothes/top/santa_top/1_back.webp   |  3 +++
 .../tonks/clothes/top/santa_top/outline.webp  |  3 +++
 .../clothes/top/santa_top/outline_back.webp   |  3 +++
 .../tonks/clothes/top/santa_top/skin.webp     |  3 +++
 game/scripts/characters/tonks/wardrobe.rpy    | 10 ++++++++
 .../characters/tonks/wardrobe_reactions.rpy   | 20 ++++++++++++++--
 .../mirror/events/genies_christmas_wish.rpy   | 24 +++++++++++++++++++
 16 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 game/characters/tonks/clothes/bra/santa_bra/0.webp
 create mode 100644 game/characters/tonks/clothes/bra/santa_bra/outline.webp
 create mode 100644 game/characters/tonks/clothes/bra/santa_bra/skin.webp
 create mode 100644 game/characters/tonks/clothes/panties/santa_panties/0.webp
 create mode 100644 game/characters/tonks/clothes/panties/santa_panties/outline.webp
 create mode 100644 game/characters/tonks/clothes/panties/santa_panties/skin.webp
 create mode 100644 game/characters/tonks/clothes/top/santa_top/0.webp
 create mode 100644 game/characters/tonks/clothes/top/santa_top/0_back.webp
 create mode 100644 game/characters/tonks/clothes/top/santa_top/1.webp
 create mode 100644 game/characters/tonks/clothes/top/santa_top/1_back.webp
 create mode 100644 game/characters/tonks/clothes/top/santa_top/outline.webp
 create mode 100644 game/characters/tonks/clothes/top/santa_top/outline_back.webp
 create mode 100644 game/characters/tonks/clothes/top/santa_top/skin.webp

diff --git a/game/characters/tonks/clothes/bra/santa_bra/0.webp b/game/characters/tonks/clothes/bra/santa_bra/0.webp
new file mode 100644
index 00000000..471e4ffb
--- /dev/null
+++ b/game/characters/tonks/clothes/bra/santa_bra/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34e4ee4f47eb88543614afca02e4887ee971fd90bb3a33625b119524dbff0a22
+size 6924
diff --git a/game/characters/tonks/clothes/bra/santa_bra/outline.webp b/game/characters/tonks/clothes/bra/santa_bra/outline.webp
new file mode 100644
index 00000000..2cc91618
--- /dev/null
+++ b/game/characters/tonks/clothes/bra/santa_bra/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:01a73ea37f713af8af3ff4d67fa0c9a38cfbabd7ac31d94c7b0f805177983d37
+size 8642
diff --git a/game/characters/tonks/clothes/bra/santa_bra/skin.webp b/game/characters/tonks/clothes/bra/santa_bra/skin.webp
new file mode 100644
index 00000000..0f1160fa
--- /dev/null
+++ b/game/characters/tonks/clothes/bra/santa_bra/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30b9e03de50ee7fac1dcc61f1d88c739b7eefe3f562039f2b54ee2d9967a7b58
+size 3994
diff --git a/game/characters/tonks/clothes/panties/santa_panties/0.webp b/game/characters/tonks/clothes/panties/santa_panties/0.webp
new file mode 100644
index 00000000..0d9a79d7
--- /dev/null
+++ b/game/characters/tonks/clothes/panties/santa_panties/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83d5d2430cdf6fad3738d4c96f95f53bfa517e9ef05755dd64d0ea5f54dd1bd6
+size 4994
diff --git a/game/characters/tonks/clothes/panties/santa_panties/outline.webp b/game/characters/tonks/clothes/panties/santa_panties/outline.webp
new file mode 100644
index 00000000..242a6256
--- /dev/null
+++ b/game/characters/tonks/clothes/panties/santa_panties/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c1de551df31148a9cb0decec0709ff6c89735c8018d6db5d3387e8e1ef592bb
+size 6838
diff --git a/game/characters/tonks/clothes/panties/santa_panties/skin.webp b/game/characters/tonks/clothes/panties/santa_panties/skin.webp
new file mode 100644
index 00000000..a1eac47b
--- /dev/null
+++ b/game/characters/tonks/clothes/panties/santa_panties/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1beae634409b2cd80027673969239bed99d5e12d2b2701e3ffa842decc020960
+size 5434
diff --git a/game/characters/tonks/clothes/top/santa_top/0.webp b/game/characters/tonks/clothes/top/santa_top/0.webp
new file mode 100644
index 00000000..61b859ba
--- /dev/null
+++ b/game/characters/tonks/clothes/top/santa_top/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:814c08685f69f22c0d976113a32ebb9e21c28e3d9831347c9e6d7b919541ac95
+size 13326
diff --git a/game/characters/tonks/clothes/top/santa_top/0_back.webp b/game/characters/tonks/clothes/top/santa_top/0_back.webp
new file mode 100644
index 00000000..e67d172b
--- /dev/null
+++ b/game/characters/tonks/clothes/top/santa_top/0_back.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f32cc39d2f01ed41045829ba0435a5f24626575404cd935e155a327b3885a06
+size 3228
diff --git a/game/characters/tonks/clothes/top/santa_top/1.webp b/game/characters/tonks/clothes/top/santa_top/1.webp
new file mode 100644
index 00000000..5da9d9d2
--- /dev/null
+++ b/game/characters/tonks/clothes/top/santa_top/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5305e0897bd14d99c9b7d14a4eea3cf47525424647ae62fddf33a431afd1bea
+size 13600
diff --git a/game/characters/tonks/clothes/top/santa_top/1_back.webp b/game/characters/tonks/clothes/top/santa_top/1_back.webp
new file mode 100644
index 00000000..941c6b6d
--- /dev/null
+++ b/game/characters/tonks/clothes/top/santa_top/1_back.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa399947db1b86ead6031e10373f33a8c0c91ed5395cffd89ec0a8daaba744ba
+size 2934
diff --git a/game/characters/tonks/clothes/top/santa_top/outline.webp b/game/characters/tonks/clothes/top/santa_top/outline.webp
new file mode 100644
index 00000000..dee10629
--- /dev/null
+++ b/game/characters/tonks/clothes/top/santa_top/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:271c889b1b01aed183b5610492a85d3fdd431a3fa3e3893f53d7b1173dd141b4
+size 18060
diff --git a/game/characters/tonks/clothes/top/santa_top/outline_back.webp b/game/characters/tonks/clothes/top/santa_top/outline_back.webp
new file mode 100644
index 00000000..ec2cda1c
--- /dev/null
+++ b/game/characters/tonks/clothes/top/santa_top/outline_back.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d70d6ba8beed130913d68d5bd5df06c7e404555caed37d64898ba8c127e189ec
+size 4454
diff --git a/game/characters/tonks/clothes/top/santa_top/skin.webp b/game/characters/tonks/clothes/top/santa_top/skin.webp
new file mode 100644
index 00000000..bea3dc76
--- /dev/null
+++ b/game/characters/tonks/clothes/top/santa_top/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26fc29a0b5e2af37d2f46f7020dea5e05331cec5290681c636eb09333322d695
+size 3216
diff --git a/game/scripts/characters/tonks/wardrobe.rpy b/game/scripts/characters/tonks/wardrobe.rpy
index 199d826f..0627d5a1 100644
--- a/game/scripts/characters/tonks/wardrobe.rpy
+++ b/game/scripts/characters/tonks/wardrobe.rpy
@@ -231,6 +231,16 @@ default ton_outfit_elf = DollOutfit([ton_hair_base_new, ton_makeup3_elf_ears, to
 default ton_outfit_ribbon = DollOutfit([ton_hair_base_new, ton_neckwear_choker1, ton_bra_ribbon, ton_panties_ribbon])
 default ton_outfit_xmas = DollOutfit([ton_hair_base_new, ton_hat_antlers, ton_earring_bells, ton_neckwear_bell1, ton_bra_pasties2, ton_bottom_xmas, ton_gloves_xmas, ton_stockings_xmas], addons=[ton_piercing1_nipple_bells, ton_bra_pasties2])
 
+##################
+## Santa Outfit ##
+##################
+
+default ton_bra_santa = DollCloth("tonks", ("upper undergarment", "bras"), "bra", "santa_bra", [[161, 55, 48, 255]])
+default ton_top_santa = DollCloth("tonks", ("upper body", "shirts"), "top", "santa_top", [[161, 55, 48, 255], [255, 255, 255, 255]])
+default ton_panties_santa = DollCloth("tonks", ("lower undergarment", "panties"), "panties", "santa_panties", [[161, 55, 48, 255]])
+
+default ton_outfit_santa = DollOutfit([ton_hair_base_new, ton_panties_santa, ton_top_santa, ton_bra_santa])
+
 ###################
 ## Lady D Outfit ##
 ###################
diff --git a/game/scripts/characters/tonks/wardrobe_reactions.rpy b/game/scripts/characters/tonks/wardrobe_reactions.rpy
index c1e50ab5..2b3f8e36 100644
--- a/game/scripts/characters/tonks/wardrobe_reactions.rpy
+++ b/game/scripts/characters/tonks/wardrobe_reactions.rpy
@@ -471,14 +471,14 @@ label ton_reaction_equip_outfit(item):
         ton "You sure you'd want that?" ("soft", "base", "raised", "mid")
         gen "Of course!" ("base", xpos="far_left", ypos="head")
         ton "But what if you've been to naughty this year for you to unwrap me?" ("soft", "narrow", "raised", "mid")
-        gen "I'll just have you unwrap yourself in thas case." ("base", xpos="far_left", ypos="head")
+        gen "I'll just have you unwrap yourself in that case." ("base", xpos="far_left", ypos="head")
         ton "*Hmph*... That's cheating..." ("soft", "base", "base", "R")
 
     ##################
     ### Xmas Outfit ##
     ##################
     elif item == ton_outfit_xmas:
-        gen "Miss Tonks, you know what the best thing about christmas is?" ("base", xpos="far_left", ypos="head")
+        gen "Miss Tonks, you know what the best thing about Christmas is?" ("base", xpos="far_left", ypos="head")
         ton "The presents?" ("base", "base", "raised", "mid")
         gen "After that." ("base", xpos="far_left", ypos="head")
         ton "The food?" ("soft", "base", "base", "mid")
@@ -489,6 +489,17 @@ label ton_reaction_equip_outfit(item):
         gen "Yes, put this on for me will you?" ("base", xpos="far_left", ypos="head")
         ton "Very well..." ("base", "base", "base", "mid")
 
+    ##################
+    ## Santa Outfit ##
+    ##################
+    elif item == ton_outfit_santa:
+        gen "Ho-Ho-Ho!" ("grin", xpos="far_left", ypos="head")
+        ton "Yes?" ("soft", "base", "base", "mid")
+        gen "No, I'm doing a Santa laugh!" ("base", xpos="far_left", ypos="head")
+        ton "Oh, I see!" ("grin", "base", "raised", "mid")
+        gen "Anyway, I've got this sexy Santa costume for you to wear." ("grin", xpos="far_left", ypos="head")
+        ton "*Mmm*... Say no more..." ("horny", "narrow", "base", "mid")
+
     ###################
     ## Lady D Outfit ##
     ###################
@@ -653,6 +664,11 @@ label ton_reaction_equip_outfit_fail(item):
     ##################
     # elif item == ton_outfit_xmas:
 
+    ##################
+    ## Santa Outfit ##
+    ##################
+    # elif item == ton_outfit_santa:
+
     ###################
     ## Lady D Outfit ##
     ###################
diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
index 72cb0b81..38b89d07 100644
--- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
+++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy
@@ -4,6 +4,7 @@ label genies_christmas_wish_rewards:
         call unlock_clothing(text=">New clothing items for Hermione have been unlocked!", item=her_outfit_reindeer)
         call unlock_clothing(text=">New clothing items for Cho have been unlocked!", item=cho_outfit_reindeer)
         call unlock_clothing(text=">New clothing items for Luna have been unlocked!", item=lun_outfit_reindeer)
+        call unlock_clothing(text=">New clothing items for Tonks have been unlocked!", item=ton_outfit_santa)
 
         python:
             naughty_list_ITEM.owned = 1
@@ -27,6 +28,7 @@ label genies_christmas_wish:
     $ hermione.equip(her_outfit_reindeer)
     $ cho.equip(cho_outfit_reindeer)
     $ luna.equip(lun_outfit_reindeer)
+    $ tonks.equip(ton_outfit_santa)
 
     stop weather
     $ game.daytime = False
@@ -226,6 +228,28 @@ label genies_christmas_wish:
     show screen blkfade
     with d4
 
+    pause .8
+    call hide_characters
+
+    hide screen blkfade
+
+    $ renpy.play("sounds/door_down.ogg")
+    with hpunch
+
+    call play_music("stop")
+
+    call ton_chibi("stand", 810, 440)
+
+    ton "I've detected some foreign magic--" ("clench", "wide", "base", "mid", xpos="base", ypos="base", trans=d5)
+    ton "Oh, hello girls! Back already?" ("grin", "wide", "base", "L", hair="horny")
+
+    gen "Wait, you were here the whole time?!" ("angry", xpos="far_left", ypos="head")
+
+    show screen blkfade
+    with d4
+
+    nar "The end."
+
     cho "Why was I even in this story? We don't even celebrate Christmas at my home." ("open", "base", "base", "mid")
     gen "*Err*..." ("open", xpos="far_left", ypos="head")
 

From 8994c77109ab5820b4fe59949b3ebc5e62e1e872 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Fri, 23 Dec 2022 16:26:49 +0000
Subject: [PATCH 14/17] Zlayers

* Implemented zorder control for specific clothing layers
* Fixed Tonks' breasts missing shading.
---
 .../characters/tonks/body/breasts/normal.webp |  4 +--
 .../{0_back.webp => 0_zorder_8.webp}          |  0
 .../{1_back.webp => 1_zorder_8.webp}          |  0
 ...utline_back.webp => outline_zorder_8.webp} |  0
 game/scripts/doll/clothes.rpy                 | 28 +++++++++++++++++--
 game/scripts/doll/common.rpy                  |  2 +-
 game/scripts/doll/main.rpy                    |  4 +++
 game/scripts/doll/outfits.rpy                 |  2 ++
 8 files changed, 35 insertions(+), 5 deletions(-)
 rename game/characters/tonks/clothes/top/santa_top/{0_back.webp => 0_zorder_8.webp} (100%)
 rename game/characters/tonks/clothes/top/santa_top/{1_back.webp => 1_zorder_8.webp} (100%)
 rename game/characters/tonks/clothes/top/santa_top/{outline_back.webp => outline_zorder_8.webp} (100%)

diff --git a/game/characters/tonks/body/breasts/normal.webp b/game/characters/tonks/body/breasts/normal.webp
index df72fbd4..cadcd90b 100644
--- a/game/characters/tonks/body/breasts/normal.webp
+++ b/game/characters/tonks/body/breasts/normal.webp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:878652ef87c99aff155571e07aff279d28b89c1fddd2ad7ced23ed708538e531
-size 14606
+oid sha256:b8d1b06ce10c1ddf3ce260070e170a3541b635babce63ba50a6c91699ae512d8
+size 15346
diff --git a/game/characters/tonks/clothes/top/santa_top/0_back.webp b/game/characters/tonks/clothes/top/santa_top/0_zorder_8.webp
similarity index 100%
rename from game/characters/tonks/clothes/top/santa_top/0_back.webp
rename to game/characters/tonks/clothes/top/santa_top/0_zorder_8.webp
diff --git a/game/characters/tonks/clothes/top/santa_top/1_back.webp b/game/characters/tonks/clothes/top/santa_top/1_zorder_8.webp
similarity index 100%
rename from game/characters/tonks/clothes/top/santa_top/1_back.webp
rename to game/characters/tonks/clothes/top/santa_top/1_zorder_8.webp
diff --git a/game/characters/tonks/clothes/top/santa_top/outline_back.webp b/game/characters/tonks/clothes/top/santa_top/outline_zorder_8.webp
similarity index 100%
rename from game/characters/tonks/clothes/top/santa_top/outline_back.webp
rename to game/characters/tonks/clothes/top/santa_top/outline_zorder_8.webp
diff --git a/game/scripts/doll/clothes.rpy b/game/scripts/doll/clothes.rpy
index 454ba113..b185f96b 100644
--- a/game/scripts/doll/clothes.rpy
+++ b/game/scripts/doll/clothes.rpy
@@ -48,8 +48,12 @@ init python:
 
         def set_layers(self):
             for x in self.layers_special:
-                path = "{}{}.webp".format(self.imagepath, x)
-                self.__dict__[x] = path if renpy.loadable(path) else None
+
+                if x == "zorder":
+                    self.__dict__["zlayers"] = [f for f in renpy.list_files() if f.startswith(self.imagepath.lstrip("/")) and "zorder" in f]
+                else:
+                    path = "{}{}.webp".format(self.imagepath, x)
+                    self.__dict__[x] = path if renpy.loadable(path) else None
 
             for x in self.layers_additional:
                 self.__dict__[x] = []
@@ -86,6 +90,8 @@ init python:
                 self.get_armfix(mannequin=True)
             ]
 
+            sprites.extend(self.get_zlayers())
+
             sprites.sort(key=itemgetter(1))
 
             # Apply Alpha mask
@@ -146,6 +152,24 @@ init python:
             # Defers rebuild until next time get_image is called
             self.cached_icon = False
 
+        def get_zlayers(self):
+            """Returns a list of zordered layers"""
+            zlayers = []
+
+            for i in self.zlayers:
+                path, filename = os.path.split(i)
+                filename = os.path.splitext(filename)[0]
+
+                # I.e "0_zorder_35", we don't need the middle control
+                layertype, _, zorder = filename.split("_")
+
+                if layertype.isdigit():
+                    zlayers.append((self.apply_color(i, int(layertype)), int(zorder)))
+                else:
+                    zlayers.append((i, int(zorder)))
+
+            return zlayers
+
         def get_back(self):
             """Returns a list of layers displayed in the back of object/character"""
             back_outline = [self.back_outline] if self.back_outline else []
diff --git a/game/scripts/doll/common.rpy b/game/scripts/doll/common.rpy
index 63693d1c..74c2bce2 100644
--- a/game/scripts/doll/common.rpy
+++ b/game/scripts/doll/common.rpy
@@ -76,7 +76,7 @@ init -1 python:
         icon_threadlock = False
 
         layers_extra = {"extra", "outline", "overlay"}
-        layers_special = {"skin", "mask", "wind_mask"}
+        layers_special = {"skin", "mask", "wind_mask", "zorder"}
         layers_additional = {"back", "front"}
 
         blacklist_toggles = ("hair", "glasses", "pubes", "piercing", "makeup", "tattoo", "earrings")
diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy
index 7649707c..148e8f56 100644
--- a/game/scripts/doll/main.rpy
+++ b/game/scripts/doll/main.rpy
@@ -83,9 +83,13 @@ init python:
                         clothing.get_armfix(),
                         ])
 
+                    sprites.extend(clothing.get_zlayers())
+
                     if clothing.mask:
                         masks.append((clothing.mask, zorder-1))
 
+            print sprites
+
             sprites.sort(key=itemgetter(1))
             masks.sort(key=itemgetter(1))
 
diff --git a/game/scripts/doll/outfits.rpy b/game/scripts/doll/outfits.rpy
index b7e6ec1e..449bd10b 100644
--- a/game/scripts/doll/outfits.rpy
+++ b/game/scripts/doll/outfits.rpy
@@ -56,6 +56,8 @@ init python:
                     i.get_armfix(mannequin=True),
                     ])
 
+                sprites.extend(i.get_zlayers())
+
                 if i.mask:
                     masks.append((i.mask, i.zorder-1))
 

From bdd654a806595de133150f436fcf94395e8d6f5b Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Fri, 23 Dec 2022 17:03:53 +0000
Subject: [PATCH 15/17] Version bump

---
 game/scripts/options.rpy         | 2 +-
 game/scripts/utility/updater.rpy | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy
index 8e200000..638f8834 100644
--- a/game/scripts/options.rpy
+++ b/game/scripts/options.rpy
@@ -30,7 +30,7 @@ define config.developer = "auto"
 define config.console = True
 
 # Game version and naming
-define config.version = "1.44.1"
+define config.version = "1.44.2"
 define compatible_version = 1.43
 define config.name = "Witch Trainer Silver"
 
diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy
index 5e8aa8be..74f3dbf8 100644
--- a/game/scripts/utility/updater.rpy
+++ b/game/scripts/utility/updater.rpy
@@ -123,6 +123,7 @@ init python:
 
                 char.rebuild()
 
+        if current <= 1.441:
             fix_return_stack()
 
         if current > latest:

From 90e57fd6af9e04dce6ac117ab9f5f4af135e4e44 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Fri, 23 Dec 2022 19:48:00 +0000
Subject: [PATCH 16/17] Hotfix

* Fixed a crash caused by zlayers
---
 game/scripts/options.rpy         |  2 +-
 game/scripts/utility/updater.rpy | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy
index 638f8834..34581ec1 100644
--- a/game/scripts/options.rpy
+++ b/game/scripts/options.rpy
@@ -30,7 +30,7 @@ define config.developer = "auto"
 define config.console = True
 
 # Game version and naming
-define config.version = "1.44.2"
+define config.version = "1.44.3"
 define compatible_version = 1.43
 define config.name = "Witch Trainer Silver"
 
diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy
index 74f3dbf8..6ab9630b 100644
--- a/game/scripts/utility/updater.rpy
+++ b/game/scripts/utility/updater.rpy
@@ -124,6 +124,21 @@ init python:
                 char.rebuild()
 
         if current <= 1.441:
+            pass
+
+        if current <= 1.442:
+            for i in CHARACTERS:
+                char = get_character_object(i)
+
+                for j in char.wardrobe_list:
+                    j.zlayers = []
+
+                for j in char.outfits:
+                    for k in j.group:
+                        k.zlayers = []
+
+                char.rebuild()
+
             fix_return_stack()
 
         if current > latest:

From 2d7a84bf005d12dbbc48919bda7efa3f345c4bb5 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Wed, 28 Dec 2022 19:06:24 +0000
Subject: [PATCH 17/17] Bug fixes

* Fixed Genie flashing his goods in stats menu
* Fixed lipstick causing a crash in saved outfits due to missing zlayers
* Fixed debug print spam
* Version bump
---
 game/scripts/characters/genie/wardrobe.rpy | 20 +++-----------------
 game/scripts/doll/lipstick.rpy             |  5 ++++-
 game/scripts/doll/main.rpy                 |  2 --
 game/scripts/options.rpy                   |  2 +-
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/game/scripts/characters/genie/wardrobe.rpy b/game/scripts/characters/genie/wardrobe.rpy
index ebe200e5..b1a9faf8 100644
--- a/game/scripts/characters/genie/wardrobe.rpy
+++ b/game/scripts/characters/genie/wardrobe.rpy
@@ -10,25 +10,11 @@ init python:
 layeredimage genie_stats:
     anchor (0.0, 1.0)
 
-    group hair:
-        attribute nude "characters/genie/hair.webp"
-
-    group fixes:
-        attribute robes "characters/genie/robes_fix.webp"
-
     always "characters/genie/base.webp"
+    always "characters/genie/outfits/robes.webp"
+    always "characters/genie/outfits/robes_beard.webp"
 
-    group face:
-        attribute base Null()
-        attribute grin "characters/genie/grin.webp"
-        attribute angry "characters/genie/angry.webp"
-        attribute smile "characters/genie/smile.webp"
-        attribute open "characters/genie/open.webp"
-
-    group outfit:
-
-        attribute nude Null()
-        attribute robes default "characters/genie/robes.webp"
+    # TODO: Add outfit support; Low priority
 
 layeredimage genie:
     anchor (0.0, 1.0)
diff --git a/game/scripts/doll/lipstick.rpy b/game/scripts/doll/lipstick.rpy
index cd7ce07c..f6043684 100644
--- a/game/scripts/doll/lipstick.rpy
+++ b/game/scripts/doll/lipstick.rpy
@@ -6,7 +6,10 @@ init python:
 
         def set_layers(self):
             for x in self.layers_special:
-                self.__dict__[x] =  None
+                if x == "zorder":
+                    self.__dict__["zlayers"] = [f for f in renpy.list_files() if f.startswith(self.imagepath.lstrip("/")) and "zorder" in f]
+                else:
+                    self.__dict__[x] =  None
 
             for x in self.layers_additional:
                 self.__dict__[x] = []
diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy
index 148e8f56..e7d8f680 100644
--- a/game/scripts/doll/main.rpy
+++ b/game/scripts/doll/main.rpy
@@ -88,8 +88,6 @@ init python:
                     if clothing.mask:
                         masks.append((clothing.mask, zorder-1))
 
-            print sprites
-
             sprites.sort(key=itemgetter(1))
             masks.sort(key=itemgetter(1))
 
diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy
index 34581ec1..e66cfee5 100644
--- a/game/scripts/options.rpy
+++ b/game/scripts/options.rpy
@@ -30,7 +30,7 @@ define config.developer = "auto"
 define config.console = True
 
 # Game version and naming
-define config.version = "1.44.3"
+define config.version = "1.44.4"
 define compatible_version = 1.43
 define config.name = "Witch Trainer Silver"