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.
This commit is contained in:
LoafyLemon 2022-12-21 20:38:20 +00:00
parent b38147852a
commit 860212b5e1
19 changed files with 103 additions and 66 deletions

BIN
game/characters/genie/base.webp (Stored with Git LFS)

Binary file not shown.

BIN
game/characters/genie/beard.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/outfits/robes.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/outfits/robes_beard.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/outfits/santa.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/outfits/santa_beard_angry.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/outfits/santa_beard_base.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/outfits/santa_beard_grin.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/outfits/santa_beard_open.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/outfits/santa_beard_smile.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/characters/genie/robes.webp (Stored with Git LFS)

Binary file not shown.

BIN
game/characters/genie/robes_fix.webp (Stored with Git LFS)

Binary file not shown.

View File

@ -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")

View File

@ -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)

View File

@ -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

View File

@ -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

File diff suppressed because it is too large Load Diff

View File

@ -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()

View File

@ -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()